[Orca-checkins] r378 - trunk/orca/lib

[Blair Zajac]

Author: blair
Date: Thu Jul 22 17:58:49 2004
New Revision: 378

Modified:
   trunk/orca/lib/Makefile.in
Log:
* lib/Makefile.in
  Instead of using @PERL@ throughout the file, set $(PERL) to @PERL@
    and use $(PERL) instead so that $(PERL) can be changed once at the
    top of the Makefile.
  In the install rule, print the command line of svnversion being run,
    because it may take a while and the user should not have to wonder
    what it taking the make install to finish.


Modified: trunk/orca/lib/Makefile.in
==============================================================================
--- trunk/orca/lib/Makefile.in	(original)
+++ trunk/orca/lib/Makefile.in	Thu Jul 22 17:58:49 2004
@@ -5,6 +5,7 @@
 libdir                = @libdir@
 INSTALL               = @INSTALL@
 MKDIR                 = @MKDIR@
+PERL                  = @PERL@
 
 all: Makefile \
      orca_logo.gif.hex \
@@ -14,17 +15,17 @@
 # Create a hex file representation of orca_logo.gif that can be stored
 # inside orca.pl.
 orca_logo.gif.hex: orca_logo.gif
-	perl -e 'while (sysread(STDIN, $$b, 35)){print unpack("h*", $$b),"\n"}' < $< > $@
+	$(PERL) -e 'while (sysread(STDIN, $$b, 35)){print unpack("h*", $$b),"\n"}' < $< > $@
 
 # Create a hex file representation of rrdtool_logo.gif that can be
 # stored inside orca.pl.
 rrdtool_logo.gif.hex: rrdtool_logo.gif
-	perl -e 'while (sysread(STDIN, $$b, 35)){print unpack("h*", $$b),"\n"}' < $< > $@
+	$(PERL) -e 'while (sysread(STDIN, $$b, 35)){print unpack("h*", $$b),"\n"}' < $< > $@
 
 # Create a hex file representation of rothschild_image_logo.png that
 # can be stored inside orca.pl.
 rothschild_image_logo.png.hex: rothschild_image_logo.png
-	perl -e 'while (sysread(STDIN, $$b, 35)){print unpack("h*", $$b),"\n"}' < $< > $@
+	$(PERL) -e 'while (sysread(STDIN, $$b, 35)){print unpack("h*", $$b),"\n"}' < $< > $@
 
 install: all
 	$(MKDIR) $(libdir)/Orca
@@ -50,14 +51,15 @@
 	    $(INSTALL) -m 0644 $$f $(libdir)/$$d; \
 	  done \
 	done
+	@echo 'cd ..; svnversion . 2>/dev/null'
 	@current_rev="`cd ..; svnversion . 2>/dev/null`"; \
 	if test "$$current_rev" != "" && \
            test "$$current_rev" != "exported"; then \
 	  echo "Found good svnversion for `cd ..; pwd`: $$current_rev"; \
-	  echo @PERL@ -w -p -i \
+	  echo $(PERL) -w -p -i \
 	    -e 's/^(\$$ORCA_VER_REVISION\s*=\s*).*/$${1}"'$$current_rev'";/' \
 	    $(libdir)/Orca/Constants.pm; \
-	  @PERL@ -w -p -i \
+	  $(PERL) -w -p -i \
 	    -e 's/^(\$$ORCA_VER_REVISION\s*=\s*).*/$${1}"'$$current_rev'";/' \
 	    $(libdir)/Orca/Constants.pm; \
 	fi