OSSP CVS Repository

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

Check-in Number: 2523
Date: 2002-Aug-21 15:26:27 (local)
2002-Aug-21 13:26:27 (UTC)
User:rse
Branch:
Comment: fix DESTDIR support
Tickets:
Inspections:
Files:
ossp-pkg/l2/Makefile.in      1.45 -> 1.46     0 inserted, 5 deleted

ossp-pkg/l2/Makefile.in 1.45 -> 1.46

--- Makefile.in  2002/07/30 19:08:24     1.45
+++ Makefile.in  2002/08/21 13:26:27     1.46
@@ -180,8 +180,6 @@
 
 #   perform standard installation procedure
 install: all
-        $(MAKE) $(MFLAGS) install-std install-c
-install-std:
         $(SHTOOL) mkdir -p -f -m 755 $(DESTDIR)$(bindir)
         $(SHTOOL) mkdir -p -f -m 755 $(DESTDIR)$(includedir)
         $(SHTOOL) mkdir -p -f -m 755 $(DESTDIR)$(libdir)
@@ -191,7 +189,6 @@
         $(SHTOOL) install -c -m 644 l2-config.1 $(DESTDIR)$(mandir)/man1/l2-config.1
         $(SHTOOL) install -c -m 755 l2tool $(DESTDIR)$(bindir)/l2tool
         $(SHTOOL) install -c -m 644 l2tool.1 $(DESTDIR)$(mandir)/man1/l2tool.1
-install-c:
         $(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 \
@@ -200,11 +197,9 @@
 #   perform standard uninstallation procedure
 uninstall:
         $(MAKE) $(MFLAGS) uninstall-c uninstall-std
-uninstall-c:
         @$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libl2.la
         $(RM) $(DESTDIR)$(includedir)/l2.h
         $(RM) $(DESTDIR)$(mandir)/man3/l2.3
-uninstall-std:
         $(RM) $(DESTDIR)$(mandir)/man1/l2tool.1
         $(RM) $(DESTDIR)$(bindir)/l2tool
         $(RM) $(DESTDIR)$(mandir)/man1/l2-config.1

CVSTrac 2.0.1