From: mike <mike@7a7537e8-13f0-0310-91df-b6672ffda945>
Date: Thu, 17 Apr 2003 14:21:34 +0000 (+0000)
Subject: Mirror 1.1.x change.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2abcdcaa52058ba4ed6b51b47fedd112aaf3d30f;p=thirdparty%2Fcups.git

Mirror 1.1.x change.


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@3631 7a7537e8-13f0-0310-91df-b6672ffda945
---

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index 07332bc311..a32fb9a539 100644
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,9 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.19rc2
 
+	- The path for the "ln" command was hardcoded in
+	  Makedefs.in instead of being checked at configure time
+	  (STR #28).
 	- Banner pages containing unescaped { characters would
 	  not work.
 	- The printer-state-time collection attribute was
diff --git a/Makedefs.in b/Makedefs.in
index c1666b64a7..3b7422623d 100644
--- a/Makedefs.in
+++ b/Makedefs.in
@@ -1,5 +1,5 @@
 #
-# "$Id: Makedefs.in,v 1.36.2.16 2003/04/14 20:09:29 mike Exp $"
+# "$Id: Makedefs.in,v 1.36.2.17 2003/04/17 14:21:33 mike Exp $"
 #
 #   Common makefile definitions for the Common UNIX Printing System (CUPS).
 #
@@ -34,7 +34,7 @@ DSO		=	@DSO@
 HTMLDOC		=	@HTMLDOC@
 INSTALL		=	@INSTALL@
 LIBTOOL		=	@LIBTOOL@
-LN		=	/bin/ln -sf
+LN		=	@LN@ -sf
 MV		=	@MV@
 NROFF		=	@NROFF@
 RANLIB		=	@RANLIB@
@@ -183,5 +183,5 @@ MAN8DIR		=	@MAN8DIR@
 
 
 #
-# End of "$Id: Makedefs.in,v 1.36.2.16 2003/04/14 20:09:29 mike Exp $"
+# End of "$Id: Makedefs.in,v 1.36.2.17 2003/04/17 14:21:33 mike Exp $"
 #
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 3f1fcf2a89..231efaafb5 100644
--- a/config-scripts/cups-common.m4
+++ b/config-scripts/cups-common.m4
@@ -1,5 +1,5 @@
 dnl
-dnl "$Id: cups-common.m4,v 1.12.2.15 2003/04/14 19:56:01 mike Exp $"
+dnl "$Id: cups-common.m4,v 1.12.2.16 2003/04/17 14:21:34 mike Exp $"
 dnl
 dnl   Common configuration stuff for the Common UNIX Printing System (CUPS).
 dnl
@@ -52,6 +52,7 @@ fi
 AC_PROG_RANLIB
 AC_PATH_PROG(AR,ar)
 AC_PATH_PROG(HTMLDOC,htmldoc)
+AC_PATH_PROG(LN,ln)
 AC_PATH_PROG(MV,mv)
 AC_PATH_PROG(NROFF,nroff)
 if test "$NROFF" = ""; then
@@ -199,5 +200,5 @@ AC_SUBST(DEFAULT_IPP_PORT)
 AC_DEFINE_UNQUOTED(CUPS_DEFAULT_IPP_PORT,$DEFAULT_IPP_PORT)
 
 dnl
-dnl End of "$Id: cups-common.m4,v 1.12.2.15 2003/04/14 19:56:01 mike Exp $".
+dnl End of "$Id: cups-common.m4,v 1.12.2.16 2003/04/17 14:21:34 mike Exp $".
 dnl