OSSP CVS Repository

ossp - Difference in ossp-pkg/flow2rrd/Makefile.in versions 1.2 and 1.3
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [History

ossp-pkg/flow2rrd/Makefile.in 1.2 -> 1.3

--- Makefile.in  2004/12/26 15:20:00     1.2
+++ Makefile.in  2004/12/26 18:52:45     1.3
@@ -27,22 +27,23 @@
 @SET_MAKE@
 
 #   installation paths
-DESTDIR     =
-prefix      = @prefix@
-exec_prefix = @exec_prefix@
-bindir      = @bindir@
-sysconfdir  = @sysconfdir@
-libdir      = @libdir@
-includedir  = @includedir@
-mandir      = @mandir@
+DESTDIR       =
+prefix        = @prefix@
+exec_prefix   = @exec_prefix@
+bindir        = @bindir@
+sysconfdir    = @sysconfdir@
+libdir        = @libdir@
+includedir    = @includedir@
+mandir        = @mandir@
+localstatedir = @localstatedir@
 
 #   build tools
-RM          = rm -f
-RMDIR       = rmdir
-SHTOOL      = ./shtool
-TRUE        = true
-PERL        = @PERL@
-POD2MAN     = @POD2MAN@
+RM            = rm -f
+RMDIR         = rmdir
+SHTOOL        = ./shtool
+TRUE          = true
+PERL          = @PERL@
+POD2MAN       = @POD2MAN@
 
 #   default targets
 all: flow2rrd flow2rrd.1
@@ -53,6 +54,7 @@
         V=`$(SHTOOL) version -l txt -d long VERSION`; \
         sed -e "s;@PERL\@;$(PERL);g" \
             -e "s;@POD2MAN\@;$(POD2MAN);g" \
+            -e "s;@SYSCONFDIR\@;$(sysconfdir);g" \
             -e "s;@VERSION\@;$$V;g" \
             <flow2rrd.pl >flow2rrd && chmod a+x flow2rrd
 
@@ -68,14 +70,15 @@
         sed -e "s;FLOW2RRD_VERSION_STR;$$V2;" >flow2rrd.1
 
 #   perform installation procedure
-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)$(sysconfdir)
+        $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(localstatedir)
         $(SHTOOL) install -c -m 755 flow2rrd $(DESTDIR)$(bindir)/
         $(SHTOOL) install -c -m 644 flow2rrd.1 $(DESTDIR)$(mandir)/man1/
-        $(SHTOOL) install -c -m 644 flow2rrd.cfg $(DESTDIR)$(sysconfdir)/
+        $(SHTOOL) install -c -m 644 -e 's;@LOCALSTATEDIR\@;$(localstatedir);g' flow2rrd.cfg $(DESTDIR)$(sysconfdir)/
 
 #   perform uninstallation procedure
 uninstall:
@@ -86,6 +89,7 @@
         -$(RMDIR) $(DESTDIR)$(mandir)/man1 >/dev/null 2>&1 || $(TRUE)
         -$(RMDIR) $(DESTDIR)$(mandir) >/dev/null 2>&1 || $(TRUE)
         -$(RMDIR) $(DESTDIR)$(sysconfdir) >/dev/null 2>&1 || $(TRUE)
+        -$(RMDIR) $(DESTDIR)$(localstatedir) >/dev/null 2>&1 || $(TRUE)
         -$(RMDIR) $(DESTDIR)$(prefix) >/dev/null 2>&1 || $(TRUE)
 
 #   perform build clean up procedure

CVSTrac 2.0.1