diff options
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rwxr-xr-x | makedeb | 17 |
3 files changed, 19 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index a4e1fbb2..602a59c1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -363,7 +363,6 @@ dist_rc_DATA = \ data/menu.xml edit = $(SED) \ - -e 's!@time\@!$(shell date "+%a, %d %B %Y %T %z")!' \ -e 's!@version\@!$(VERSION)!' \ -e 's!@bindir\@!$(bindir)!' @@ -456,10 +455,4 @@ distclean-local: done \ done -deb: Makefile - $(edit) $(srcdir)/debian/changelog.in >$(srcdir)/debian/changelog - fakeroot debian/rules binary - -# dpkg-buildpackage -b -rfakeroot -f openbox-$(VERSION).tar.gz - -.PHONY: doc deb +.PHONY: doc diff --git a/debian/rules b/debian/rules index f4cf390b..0d63b650 100755 --- a/debian/rules +++ b/debian/rules @@ -27,7 +27,7 @@ endif config.status: configure dh_testdir # Add here commands to configure the package. - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" build: build-stamp diff --git a/makedeb b/makedeb new file mode 100755 index 00000000..7918d91c --- /dev/null +++ b/makedeb @@ -0,0 +1,17 @@ +#!/bin/sh -x + +# get the version from configure.ac +VERSION=$(grep AC_INIT\(\\\[openbox\\] configure.ac|cut -d [ -f 3-|cut -d ] -f 1) + +TIME="$(date '+%a, %d %B %Y %T %z')" + +IN=debian/changelog.in +OUT=debian/changelog + +# make sure configure gets run with the right parameters +make distclean || rm -f config.status + +rm -f $OUT + +sed -e "s!@time@!$TIME!" -e "s!@version@!$VERSION!" $IN >$OUT && \ +fakeroot debian/rules binary |