tidy up handling of workarounds for debstd symlink handling wierdness.

3 files changed, 21 insertions, 15 deletions

diff --git a/debian/rules b/debian/rules
index 0837247..300e0a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ dirtmp = debian/tmp
 dirdev = debian/$(develop)
 pkgtmp = DIST_ROOT=`pwd`/$(dirtmp); export DIST_ROOT;
 pkgdev = DIST_ROOT=`pwd`/$(dirdev); export DIST_ROOT;
-stdenv = GZIP=-q; export GZIP;
+stdenv = @GZIP=-q; export GZIP;
 
 options = DEBUG="-DNDEBUG"; OPTIMIZER="-O1 -g"; DISTRIBUTION="debian"; \
 	export DEBUG OPTIMIZER DISTRIBUTION;
@@ -36,6 +36,11 @@ clean:
 
 binary-indep:
 
+# Note1: dev pkg with .so symlinks to base pkg confuses debstd;
+# so the .so 'Dangling symlink' message is benign.
+# Note2: absolute symlinks (required by policy) confuse debstd;
+# so we'll filter out symlink messages entirely now.
+# 
 binary-arch: checkroot built
 	@echo "== dpkg-buildpackage: binary-arch" 1>&2
 	$(checkdir)
@@ -44,9 +49,7 @@ binary-arch: checkroot built
 	$(pkgdev) $(MAKE) -C . install-dev
 	$(pkgtmp) $(MAKE) -C build src-manifest
 	@echo "== dpkg-buildpackage: debstd" 1>&2
-	# Note: dev pkg with .so symlinks to base pkg confuses debstd;
-	# so the .so 'Dangling symlink' message below is benign.
-	$(stdenv) debstd -m
+	$(stdenv) debstd -m | grep -v 'Dangling symlink'
 	dpkg-gencontrol -isp -p$(package) -P$(dirtmp)
 	dpkg-gencontrol -isp -p$(develop) -P$(dirdev)
 	chown -R root.root $(dirtmp) $(dirdev)
diff --git a/doc/CHANGES b/doc/CHANGES
index f9c184b..ad4fcb0 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,6 +1,9 @@
-attr-0.2.0 (19 Jul 2001)
+dmapi-0.2.0 (19 Jul 2001)
 	- reworked Makefiles use of libtool slightly
 	- rework some of the Debian packaging rules
+	- libdm is now installed into /lib instead of /usr/lib
+	  as it is needed by xfsdump and xfsrestore which must
+	  be available for recovery when only root is mounted
 
 dmapi-0.1.2 (18 July 2001)
 	- change dmapi to use /proc instead of /dev/dmapi
diff --git a/include/builddefs.in b/include/builddefs.in
index c0f98b3..4514876 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -117,7 +117,7 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF) -D_REENTRANT
 LTVERSION = $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 LTOBJECTS = $(OBJECTS:.o=.lo)
 ifeq ($(ENABLE_SHARED),yes)
-LTLDFLAGS += -rpath $(PKG_LIB_DIR) 
+LTLDFLAGS += -rpath $(PKG_SLIB_DIR) 
 LTLDFLAGS += -version-info $(LTVERSION)
 endif
 LIBNAME = $(basename $(LTLIBRARY))
@@ -125,27 +125,27 @@ LIBNAME = $(basename $(LTLIBRARY))
 ifeq ($(ENABLE_SHARED),yes)
 INSTALL_LTLIB = \
 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
-	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-	../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \
+	../$(INSTALL) -m 755 -d $(PKG_SLIB_DIR); \
+	../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_SLIB_DIR); \
 	test "$(PKG_DISTRIBUTION)" = debian || \
-	../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR)
+	../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_SLIB_DIR)
 endif
 
 ifeq ($(ENABLE_SHARED),yes)
 INSTALL_LTLIB_DEV = \
 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
-	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
-	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
-	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR)
+	../$(INSTALL) -m 755 -d $(PKG_SLIB_DIR); \
+	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_SLIB_DIR); \
+	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_SLIB_DIR)/$(LIBNAME).la ; \
+	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_SLIB_DIR)
 else
 INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
 endif
 
 INSTALL_LTLIB_STATIC = \
 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
-	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR)
+	../$(INSTALL) -m 755 -d $(PKG_SLIB_DIR); \
+	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_SLIB_DIR)
 
 INSTALL_MAN = \
     @for d in $(MAN_PAGES); do \