OSSP CVS Repository

ossp - Check-in [5759]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 5759
Date: 2007-Mar-23 09:09:27 (local)
2007-Mar-23 08:09:27 (UTC)
User:rse
Branch:
Comment: - Make newer GNU autoconf happy by providing "datarootdir". - Fix installation by using GNU libtool for installing "l2-config".
Tickets:
Inspections:
Files:
ossp-pkg/l2/ChangeLog      1.33 -> 1.34     9 inserted, 0 deleted
ossp-pkg/l2/Makefile.in      1.49 -> 1.50     9 inserted, 6 deleted
ossp-pkg/l2/l2-config.in      1.9 -> 1.10     1 inserted, 0 deleted

ossp-pkg/l2/ChangeLog 1.33 -> 1.34

--- ChangeLog    2007/03/02 15:13:28     1.33
+++ ChangeLog    2007/03/23 08:09:27     1.34
@@ -9,6 +9,15 @@
   ChangeLog
   =========
 
+  Changes between 0.9.12 and 0.9.13 (02-Mar-2005 to 23-Mar-2007)
+
+    *) Make newer GNU autoconf happy by providing "datarootdir".
+       [Ralf S. Engelschall <rse@engelschall.com>]
+
+    *) Fix installation by using GNU libtool for installing "l2-config".
+       [Ralf S. Engelschall <rse@engelschall.com>,
+        Christian Vogel <chris@obelix.hedonism.cx>]
+
   Changes between 0.9.11 and 0.9.12 (03-Oct-2005 to 02-Mar-2007)
 
     *) Support for 1996-03-20 addition to Single UNIX Specification for


ossp-pkg/l2/Makefile.in 1.49 -> 1.50

--- Makefile.in  2005/10/03 08:08:11     1.49
+++ Makefile.in  2007/03/23 08:09:27     1.50
@@ -36,6 +36,7 @@
 DESTDIR     =
 prefix      = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 bindir      = @bindir@
 libdir      = @libdir@
 includedir  = @includedir@
@@ -188,21 +189,23 @@
         $(SHTOOL) mkdir -p -f -m 755 $(DESTDIR)$(mandir)/man3
         $(SHTOOL) install -c -m 755 l2-config $(DESTDIR)$(bindir)/l2-config
         $(SHTOOL) install -c -m 644 l2-config.1 $(DESTDIR)$(mandir)/man1/l2-config.1
-        $(SHTOOL) install -c -m 755 l2tool $(DESTDIR)$(bindir)/l2tool
+        @$(LIBTOOL) --mode=install \
+            $(SHTOOL) install -c -m 755 l2tool $(DESTDIR)$(bindir)/l2tool
         $(SHTOOL) install -c -m 644 l2tool.1 $(DESTDIR)$(mandir)/man1/l2tool.1
         $(SHTOOL) install -c -m 644 l2.3 $(DESTDIR)$(mandir)/man3/l2.3
         $(SHTOOL) install -c -m 644 l2.h $(DESTDIR)$(includedir)/l2.h
-        @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 \
-            libl2.la $(DESTDIR)$(libdir)/libl2.la
+        @$(LIBTOOL) --mode=install \
+            $(SHTOOL) install -c -m 644 libl2.la $(DESTDIR)$(libdir)/libl2.la
 
 #   perform standard uninstallation procedure
 uninstall:
-        $(MAKE) $(MFLAGS) uninstall-c uninstall-std
-        @$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libl2.la
+        @$(LIBTOOL) --mode=uninstall \
+            $(RM) $(DESTDIR)$(libdir)/libl2.la
         $(RM) $(DESTDIR)$(includedir)/l2.h
         $(RM) $(DESTDIR)$(mandir)/man3/l2.3
         $(RM) $(DESTDIR)$(mandir)/man1/l2tool.1
-        $(RM) $(DESTDIR)$(bindir)/l2tool
+        @$(LIBTOOL) --mode=uninstall \
+            $(RM) $(DESTDIR)$(bindir)/l2tool
         $(RM) $(DESTDIR)$(mandir)/man1/l2-config.1
         $(RM) $(DESTDIR)$(bindir)/l2-config
         $(RMDIR) $(DESTDIR)$(mandir)/man3


ossp-pkg/l2/l2-config.in 1.9 -> 1.10

--- l2-config.in 2005/10/03 08:08:11     1.9
+++ l2-config.in 2007/03/23 08:09:27     1.10
@@ -34,6 +34,7 @@
 
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
+datarootdir="@datarootdir@"
 
 l2_prefix="$prefix"
 l2_exec_prefix="$exec_prefix"

CVSTrac 2.0.1