OSSP CVS Repository

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

Check-in Number: 2928
Date: 2002-Nov-29 12:03:58 (local)
2002-Nov-29 11:03:58 (UTC)
User:ms
Branch:
Comment: Improve install and uninstall logic.
Tickets:
Inspections:
Files:
ossp-pkg/as/as-gui/Makefile.in      1.19 -> 1.20     9 inserted, 4 deleted
ossp-pkg/titraq/Makefile.in      1.19->removed

ossp-pkg/as/as-gui/Makefile.in 1.19 -> 1.20

--- Makefile.in  2002/11/28 20:44:36     1.19
+++ Makefile.in  2002/11/29 11:03:58     1.20
@@ -116,19 +116,24 @@
                --release="$$D" --date="OSSP asgui $$VS" titraq.conf.pod | \
                sed -e "s;TITRAQ_VERSION_STR;$$VL;" >titraq.conf.5
 
-install:
+install: all
         $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(prefix)
         $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir)
         $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
         $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man5
-        $(SHTOOL) install -c -m 644 titraq $(DESTDIR)$(bindir)/titraq
+        $(SHTOOL) install -c -s -m 755 titraq $(DESTDIR)$(bindir)/titraq
         $(SHTOOL) install -c -m 644 titraq.1 $(DESTDIR)$(mandir)/man1/titraq.1
         $(SHTOOL) install -c -m 644 titraq.conf.5 $(DESTDIR)$(mandir)/man5/titraq.conf.5
 
 uninstall:
-        $(RM) $(DESTDIR)$(bindir)/titraq
-        $(RM) $(DESTDIR)$(mandir)/man1/titraq.1
         $(RM) $(DESTDIR)$(mandir)/man5/titraq.conf.5
+        $(RM) $(DESTDIR)$(mandir)/man1/titraq.1
+        $(RM) $(DESTDIR)$(bindir)/titraq
+        $(RMDIR) $(DESTDIR)$(mandir)/man5 >/dev/null 2>&1 || $(TRUE)
+        $(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE)
+        $(RMDIR) $(DESTDIR)$(mandir) >/dev/null 2>&1 || $(TRUE)
+        $(RMDIR) $(DESTDIR)$(bindir) >/dev/null 2>&1 || $(TRUE)
+        $(RMDIR) $(DESTDIR)$(prefix) >/dev/null 2>&1 || $(TRUE)
 
 clean:
         $(RM) $(TARGET_PROGS) $(OBJS) $(MOC_OBJ)


CVSTrac 2.0.1