* configure.in: Substitute NEWCONFIGDIR and OLDCONFIGDIR rather

than defining them. * uuconf/Makefile.am (AM_CFLAGS): Define NEWCONFIGLIB and OLDCONFIGLIB. * configure, config.h.in, Makefile.in, */Makefile.in: Rebuild.
hsn10 · Mar 7, 2002 · 6b2e483 · 6b2e483
1 parent 67e6f99
commit 6b2e483
Show file tree

Hide file tree

Showing 10 changed files with 308 additions and 301 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,11 @@
+2002-03-07  Ian Lance Taylor  <ian@airs.com>
+
+	* configure.in: Substitute NEWCONFIGDIR and OLDCONFIGDIR rather
+	than defining them.
+	* uuconf/Makefile.am (AM_CFLAGS): Define NEWCONFIGLIB and
+	OLDCONFIGLIB.
+	* configure, config.h.in, Makefile.in, */Makefile.in: Rebuild.
+
 2002-03-06  Ian Lance Taylor  <ian@airs.com>
 
 	* uucp.texi (Compilation): Use @option in table of configure

diff --git a/Makefile.in b/Makefile.in
@@ -68,7 +68,9 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LIBOBJS = @LIBOBJS@
 LN_S = @LN_S@
 MAINT = @MAINT@
+NEWCONFIGDIR = @NEWCONFIGDIR@
 OBJEXT = @OBJEXT@
+OLDCONFIGDIR = @OLDCONFIGDIR@
 OWNER = @OWNER@
 PACKAGE = @PACKAGE@
 POUNDBANG = @POUNDBANG@

diff --git a/config.h.in b/config.h.in
@@ -369,12 +369,6 @@
 /* user ID for programs; normally uucp */
 #undef OWNER
 
-/* new config file directory; normally PREFIX/conf/uucp */
-#undef NEWCONFIGLIB
-
-/* old config file directory; normally /usr/lib/uucp */
-#undef OLDCONFIGLIB
-
 /* Whether the compiler supports prototypes */
 #undef HAVE_PROTOTYPES