install static libs and libtool archives into /usr/lib, not /lib.

diff --git a/VERSION b/VERSION
index e70cad31bd101cd2911e6891a84f4b6fbb2103ac..b762ba84e6c8079f2740c0834cef8b564ce8d92e 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=1
 PKG_MINOR=3
-PKG_REVISION=1
+PKG_REVISION=2
 PKG_BUILD=0

diff --git a/debian/changelog b/debian/changelog
index 1aaa0a7bebaf3331e8243c728b00e944a48482c4..4200347b23c6c539fcb07eb65467b6d5837fa001 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xfsprogs (1.3.2-0) unstable; urgency=low
+
+  * New upstream release
+
+ -- Nathan Scott <nathans@debian.org>  Mon, 23 Jul 2001 10:27:37 +1000
+
 xfsprogs (1.3.1-0) unstable; urgency=low
 
   * Reworked package slightly so that its not Debian native

diff --git a/doc/CHANGES b/doc/CHANGES
index 516a8d6fa88f255accd101e95bdf4e1752738b0a..fb4e2d2de2cfc6bfc4b7352e2062c476a2ccd120 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,7 @@
+xfsprogs-1.3.2 (23 July 2001)
+       - install static libs and libtool archives into /usr/lib
+       - shared libraries are unchanged, however
+
 xfsprogs-1.3.1 (15 Jul 2001)
        - updated xfs_types.h file from the kernel changes needed for
          an xfsdump fix.

diff --git a/include/builddefs.in b/include/builddefs.in
index 69a0e55e2c60ecee06063b7060ce725c37ee1fe3..b20e9ec5753749c353e54257a41ae804b668aac2 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -143,9 +143,10 @@ 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) -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)
@@ -153,8 +154,8 @@ endif
 
 INSTALL_LTLIB_STATIC = \
        cd $(TOPDIR)/$(LIBNAME)/.libs; \
-       ../$(INSTALL) -m 755 -d $(PKG_SLIB_DIR); \
-       ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_SLIB_DIR)
+       ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
+       ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR)
 
 INSTALL_MAN = \
     @for d in $(MAN_PAGES); do \