bug-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

@pr_path@ is not substituted


From: Pavel Roskin
Subject: @pr_path@ is not substituted
Date: Thu, 22 Feb 2001 15:43:46 -0500 (EST)

Hello!

The CVS version of CVS has the following line in diff/Makefile.in:

PR_PROGRAM = @pr_path@

However, the word "pr_path" cannot be found anywhere else, so @pr_path@
remains unsubstituted in Makefile and ends up in the cvs binary. On the
other hand, configure substitutes @PR@, which is more consistent with
other variables (e.g. @CC@) and is exactly what we need.

But I decided to go further and AC_DEFINE(PR_PROGRAM). I also removed it
from the makefiles completely - good thing for those who will write
diff/Makefile.am.

The patch has been tested with Autoconf-2.13 and CVS Autoconf.

_____________________
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,7 @@
+2001-02-22  Pavel Roskin  <address@hidden>
+
+       * configure.in: Define PR_PROGRAM if `pr' has been found.
+
 2001-02-20  Derek Price  <address@hidden>

        * acconfig.h (HAVE_GSSAPI): Removed.  Entries in acconfig.h aren't
--- configure.in
+++ configure.in
@@ -17,6 +17,9 @@
 AC_PATH_PROG(PERL, perl, no)
 AC_PATH_PROG(CSH, csh, no)
 AC_PATH_PROG(PR, pr, no)
+if test x"$PR" != xno; then
+       AC_DEFINE_UNQUOTED([PR_PROGRAM], ["$PR"], [Path to the pr utility])
+fi

 dnl FIXME This is truly gross.
 missing_dir=`cd $ac_aux_dir && pwd`
--- diff/ChangeLog
+++ diff/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-22  Pavel Roskin  <address@hidden>
+
+       * Makefile.in: Don't define PR_PROGRAM - it's defined by configure.
+       Remove separate rule for util.c.
+
 2000-02-06  Derek Price  <address@hidden>
            Rex Jolliff  <address@hidden>
            Shawn Smith  <address@hidden>
--- diff/Makefile.in
+++ diff/Makefile.in
@@ -31,8 +31,6 @@
 prefix = @prefix@
 exec_prefix = @exec_prefix@

-PR_PROGRAM = @pr_path@
-
 #### End of system configuration section. ####

 SHELL = /bin/sh
@@ -66,9 +64,6 @@

 $(OBJECTS): diff.h diffrun.h system.h
 analyze.o cmpbuf.o: cmpbuf.h
-
-util.o: util.c Makefile
-       $(COMPILE) -DPR_PROGRAM=\"$(PR_PROGRAM)\" $<

 # For CVS, install is dependant on all and uninstall added
 install: all
_____________________

Regards,
Pavel Roskin




reply via email to

[Prev in Thread] Current Thread [Next in Thread]