diff options
author | Pino Toscano <pino@debian.org> | 2013-02-28 14:47:26 +0100 |
---|---|---|
committer | Pino Toscano <pino@debian.org> | 2013-02-28 14:47:26 +0100 |
commit | b372d228ee8564a30bfc10df4b69f1925019e6ab (patch) | |
tree | 84173f2cb352d569e02d0247933b6fbee7982904 /debian | |
parent | 6e2322c027883f5e0be23fe35734e5d9a400aacf (diff) |
hurd{,-dev,-udeb}.install -> hurd{,-dev,-udeb}.install.in
generate the .install files at build time, so we can put values known only at build time
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/hurd-dev.install.in (renamed from debian/hurd-dev.install) | 0 | ||||
-rw-r--r-- | debian/hurd-udeb.install.in (renamed from debian/hurd-udeb.install) | 0 | ||||
-rw-r--r-- | debian/hurd.install.in (renamed from debian/hurd.install) | 0 | ||||
-rwxr-xr-x | debian/rules | 10 |
5 files changed, 12 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 24a7cfb9..49b60e90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ hurd (20130226-2) UNRELEASED; urgency=low - Remove hurd (a bit pointless, since it is essential). - Add www-browser (for the HTML documentation). * Add missing autotools-dev build dependency (for the autotools_dev dh addon). + * Rename hurd{,-dev,-udeb}.install to hurd{,-dev,-udeb}.install.in, and + generate the .install files at build time. -- Samuel Thibault <sthibault@debian.org> Tue, 26 Feb 2013 23:51:12 +0100 diff --git a/debian/hurd-dev.install b/debian/hurd-dev.install.in index 48394b45..48394b45 100644 --- a/debian/hurd-dev.install +++ b/debian/hurd-dev.install.in diff --git a/debian/hurd-udeb.install b/debian/hurd-udeb.install.in index 486763b8..486763b8 100644 --- a/debian/hurd-udeb.install +++ b/debian/hurd-udeb.install.in diff --git a/debian/hurd.install b/debian/hurd.install.in index 0d94d7dd..0d94d7dd 100644 --- a/debian/hurd.install +++ b/debian/hurd.install.in diff --git a/debian/rules b/debian/rules index 7a4e78ee..ad11b805 100755 --- a/debian/rules +++ b/debian/rules @@ -24,6 +24,9 @@ SUID_PROGRAMS = /bin/ids /bin/login /bin/ps-hurd /usr/bin/w-hurd CC=gcc-4.7 +INSTALL_in := $(wildcard debian/*.install.in) +INSTALL_generated := $(patsubst %.in,%,$(INSTALL_in)) + %: dh $@ -Bbuild --with autotools_dev @@ -41,6 +44,7 @@ override_dh_auto_clean: rm -f $$(find libdde_linux26 -name \*.d) rm -fr libdde_linux26/build rm -fr libdde_linux26/lib/src/gen_crc32table libdde_linux26/lib/src/crc32table.h libdde_linux26/lib/src/timeconst.h + rm -f $(INSTALL_generated) override_dh_auto_install: dh_auto_install -Bbuild --destdir= -- prefix=$(DEB_DESTDIR) sysconfdir=$(DEB_DESTDIR)/etc localstatedir=$(DEB_DESTDIR)/var XKB_BASE=$(DEB_DESTDIR)/usr/share/X11/xkb @@ -66,6 +70,9 @@ override_dh_auto_install: # remove PIC static libraries rm -f debian/tmp/lib/*_pic.a +override_dh_install: $(INSTALL_generated) + dh_install + override_dh_installinit: dh_installinit -phurd --name=hurd-console dh_installinit --remaining-packages @@ -82,3 +89,6 @@ override_dh_makeshlibs: dh_makeshlibs -phurd --add-udeb=hurd-udeb dh_makeshlibs --remaining-packages +debian/%.install: debian/%.install.in + cat $^ > $@ + |