diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2001-05-21 02:48:41 +0000 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2001-05-21 02:48:41 +0000 |
| commit | 1893e7133190994b173bdb560d5bd14425c9d49c (patch) | |
| tree | a4a839da08de1d6f89d88be812b7c7d7a0ca66fd /debian/rules | |
| parent | eac6c0d01bee798672cfe45b4154645a9285c5cc (diff) | |
| download | e2fsprogs-1893e7133190994b173bdb560d5bd14425c9d49c.tar.gz | |
changelog, control, rules, e2fsck-static.files, e2fsprogs.copyright:
Update to sync up with Debian's e2fsprogs_1.19+1.20-WIP-0514-2 release.
Diffstat (limited to 'debian/rules')
| -rw-r--r-- | debian/rules | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/debian/rules b/debian/rules index 864fb31c..ff906380 100644 --- a/debian/rules +++ b/debian/rules @@ -47,12 +47,19 @@ mandir=${maindir}${MANDIR} SUBPACKAGES_DIRS = tmp e2fslibs-dev comerr-dev ss-dev -installdoc = install -m 644 -installbin = install -m 755 - -CCOPTS = -g -O2 -fsigned-char +CCOPTS = -O2 -fsigned-char LIBC-DEV = libc6-dev +INSTALL = install +INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) +CCOPTS += -g -O1 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) +INSTALL_PROGRAM += -s +endif + ifeq (${DEB_HOST_ARCH},alpha) CCOPTS += -DHAVE_NETINET_IN_H LIBC-DEV = libc6.1-dev @@ -101,20 +108,19 @@ binary-indep: build # no arch-independant debs. binary-arch: build - dh_testversion 0.56 # == 0.53 + fixes dh_testdir -a dh_testroot -a dh_clean -a dh_installdirs -a mkdir -p ${maindir}/sbin - make -C ${builddir} install DESTDIR=${maindir} + make -C ${builddir} install DESTDIR=${maindir} INSTALL_PROGRAM="${INSTALL_PROGRAM}" LDCONFIG=true # static libs and .h files - make -C ${builddir} install-libs DESTDIR=${maindir} + make -C ${builddir} install-libs DESTDIR=${maindir} LDCONFIG=true -# correct locations - (cd ${maindir}/sbin && mv debugfs ../usr/sbin/) - (cd ${maindir}/sbin && mv e2label ../usr/sbin/) + # statically-linked fsck + ${INSTALL_PROGRAM} ${builddir}/e2fsck/e2fsck.static ${maindir}/sbin + ln -s e2fsck.8.gz ${mandir}/man8/e2fsck.static.8.gz # docs # fully handled by debhelper @@ -123,6 +129,9 @@ binary-arch: build mkdir -p ${debdir}/e2fslibs-dev/usr/share/doc/e2fsprogs ln -sf e2fsprogs ${debdir}/e2fslibs-dev/usr/share/doc/e2fslibs-dev + mkdir -p ${debdir}/e2fsck-static/usr/share/doc/ + ln -sf e2fsprogs ${debdir}/e2fsck-static/usr/share/doc/e2fsck-static + mkdir -p ${maindir}/usr/share/doc/libcomerr${COMERR_MAJOR} mkdir -p ${debdir}/comerr-dev/usr/share/doc/libcomerr${COMERR_MAJOR} ln -sf libcomerr${COMERR_MAJOR} ${debdir}/comerr-dev/usr/share/doc/comerr-dev @@ -192,9 +201,8 @@ binary-arch: build echo "libcdev:Depends=${LIBC-DEV}" >> debian/e2fslibs-dev.substvars dh_installdeb -a - LD_LIBRARY_PATH=${builddir}/lib:/lib:/usr/lib \ - dh_shlibdeps -a - dh_gencontrol -pe2fsprogs -pe2fslibs-dev + dh_shlibdeps -a -l${builddir}/lib + dh_gencontrol -pe2fsprogs -pe2fslibs-dev -pe2fsck-static dh_gencontrol -pcomerr-dev \ -u '-v${COMERR_VERSION}-${MAIN_VERSION}' dh_gencontrol -pss-dev \ |