-diff -Nru LPRng-3.6.26/configure.in LPRng-3.6.26.new/configure.in
---- LPRng-3.6.26/configure.in Mon Oct 16 21:11:58 2000
-+++ LPRng-3.6.26.new/configure.in Mon Oct 16 21:11:30 2000
-@@ -2,44 +2,17 @@
- dnl
- dnl $Id$
-
--PACKAGE=LPRng
--VERSION=3.6.26
--
- dnl ----------------------------------------------------------------------------
+--- LPRng-3.8.1/configure.in.orig Fri Nov 16 17:01:56 2001
++++ LPRng-3.8.1/configure.in Sun Nov 18 13:01:43 2001
+@@ -6,53 +6,19 @@
dnl ----------------- START OF GENERAL CONFIGURATION ---------------------------
AC_INIT(Makefile.in)
--AC_CONFIG_AUX_DIR(.)
- AC_CANONICAL_SYSTEM
+
+-
+-PACKAGE=LPRng
+-VERSION=3.8.1
++AM_INIT_AUTOMAKE(LPRng, 3.8.0)
+
+
+ AC_CONFIG_AUX_DIR(.)
+-AC_CANONICAL_SYSTEM
AC_CONFIG_HEADER(config.h)
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
--ALL_LINGUAS="fr"
+ ALL_LINGUAS="fr"
+
+-WITH_CC dnl
+-WITH_CCOPTS dnl
+-WITH_LINKER dnl
+-WITH_LDOPTS dnl
+-WITH_CPPOPTS dnl
+-if test -z "$LOCALEDIR" ; then
+- LOCALEDIR='${prefix}/share/locale'
+-fi;
+-WITH_LOCALEDIR dnl
+-export LOCALEDIR
-
-AC_PREFIX_DEFAULT(/usr/local)
-AC_SUBST(INSTALL)
-AC_SUBST(CPPFLAGS)
-AC_SUBST(LDFLAGS)
-AC_SUBST(LDCC)
-+AM_INIT_AUTOMAKE(LPRng, 3.6.26)
-
+-
+-
dnl check for awk
AC_PROG_AWK
-AC_SUBST(AWK)
- AC_PATH_PROG(PERL,perl)dnl
+-AC_PATH_PROG(PERL,perl)dnl
-AC_SUBST(PERL)dnl
+-AC_PATH_PROG(CHOWN,chown)dnl
+-AC_SUBST(CHOWN)dnl
+-AC_PATH_PROG(CHGRP,chgrp)dnl
+-AC_SUBST(CHGRP)dnl
-
--WITH_CC dnl
--WITH_CCOPTS dnl
--WITH_LINKER dnl
--WITH_LDOPTS dnl
--WITH_CPPOPTS dnl
--
++AC_PATH_PROG(PERL,perl)
++AC_PATH_PROG(CHOWN,chown)
++AC_PATH_PROG(CHGRP,chgrp)
dnl ----------------------------------------------------------------------------
dnl ----------- XXXXXX START OF OPTIONS ----------------------------------------
-@@ -299,37 +272,11 @@
+@@ -333,16 +299,6 @@
AC_MSG_RESULT($FILTER_DIR)
AC_SUBST(FILTER_DIR)
-)
-AC_MSG_RESULT($v)
-AC_SUBST(STRIP)
+-
+ dnl ----------------------------------------------------------------------------
+ dnl ------------ OS Checks --------------------------------------------------
+
+@@ -350,50 +306,12 @@
+ AC_MINIX
+ AC_AIX
+
+-
+-changequote(, )dnl
+-release=`uname -r 2>/dev/null; exit 0`;
+-version=`echo $target_os | sed -e 's/[^0-9][^0-9]*//' -e 's/\./X/' -e 's/\.//g' -e 's/X/./' \
+- | awk '{ v=$1+0; if( v > 0 ){ while( v < 100 || int(v) != v ){v = v * 10;}}; print v; }' `;
+-if test "$version" -eq 0 ; then
+- version=`echo $release | sed -e 's/-.*//' -e 's/\.//g' \
+- | awk '{ v=$1+0; if( v > 0 ){ while( v < 100 || int(v) != v ){v = v * 10;}}; print v; }' `;
+-fi
+-osword=`echo $target_os | sed -e 's/[0-9].*//'`; export osword
+-changequote([, ])dnl
+-AC_MSG_RESULT([Target is $target, arch $target_cpu, os $target_os, release $release, version $version])
+-
+-AC_DEFINE_UNQUOTED(ARCHITECTURE,"$target_cpu")
+-AC_DEFINE_UNQUOTED(OSNAME,"$osword")
+-AC_DEFINE_UNQUOTED(OSVERSION,$version)
+-OSNAME=$osword
+-OSVERSION=$version
+-AC_SUBST(OSNAME)dnl
+-AC_SUBST(OSVERSION)dnl
+-
-
dnl ----------------------------------------------------------------------------
dnl ----------- C compiler checks -----------------------------------------
- AC_PROG_CC
+
AC_PROG_CPP
+ AC_PROG_CC
-if test "$ac_cv_prog_gcc" = yes; then
- cat >conftest.c <<EOF
-fi;
-
-LDCC="$CC"
+-
+ AM_PROG_LIBTOOL
+
+ AC_C_CONST
+@@ -451,77 +369,6 @@
+ AC_DEFINE(HAVE_QUAD_T)
+ fi
+
+-
+-dnl ----------------------------------------------------------------------------
+-dnl OS dependency checks
+-checklibs=
+-case $target_os in
+- *linux* )
+- no_resolv_lib=yes;
+- case $release in
+-changequote(, )dnl
+- 2.2.1[0-5]* )
+-changequote([, ])dnl
+- AC_DEFINE(SETUID_CHECK)
+- AC_MSG_WARN([Kernel may have SETUID compromise. Update kernel])
+- ;;
+- esac
+- ;;
+- *bsdi* )
+- LDCC=shlicc
+- dnl BSDI uses this for setproctitle
+- AC_CHECK_LIB(util, setproctitle, [LIBS="-lutil $LIBS"])
+- ;;
+- *bsd* )
+- dnl *BSD uses this for setproctitle
+- AC_CHECK_LIB(util, setproctitle, [LIBS="-lutil $LIBS"])
+- ;;
+- *unicos* )
+- checklibs=no
+- ;;
+- *irix6* )
+- checklibs=no
+- AC_DEFINE_UNQUOTED(IRIX,$version)
+- ;;
+- *irix5* )
+- checklibs=no
+- AC_DEFINE(HAVE_BROKEN_TIOCEXCL)
+- AC_DEFINE(SVR4)
+- AC_DEFINE_UNQUOTED(IRIX,$version)
+- ;;
+- *irix* )
+- checklibs=no
+- AC_DEFINE_UNQUOTED(IRIX,$version)
+- ;;
+- *solaris* )
+- AC_DEFINE(SVR4)
+- AC_DEFINE_UNQUOTED(SOLARIS,$version)
+- no_resolv_lib=yes;
+- ;;
+- *hpux* )
+- AC_DEFINE(_HPUX_SOURCE)
+- CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE=1"
+- CFLAGS="$CFLAGS -D_HPUX_SOURCE=1"
+- AC_DEFINE_UNQUOTED(HPUX,$version)
+- ;;
+- *sunos* )
+- AC_DEFINE_UNQUOTED(SUNOS,$version)
+- ;;
+- osf* )
+- AC_DEFINE_UNQUOTED(DECALPHA,$version)
+- if test "$ac_cv_prog_gcc" != yes; then
+- CPPFLAGS="$CPPFLAGS -std";
+- CFLAGS="$CFLAGS -std";
+- else
+- CPPFLAGS="$CPPFLAGS -DAES_SOURCE"
+- CFLAGS="$CFLAGS -DAES_SOURCE"
+- fi
+- ;;
+- *mips-sni* )
+- ;;
+-esac
+-AC_MSG_RESULT([using CPPFLAGS=\"${CPPFLAGS}\", CFLAGS=\"${CFLAGS}\"])
-
dnl ----------------------------------------------------------------------------
- dnl ------------ OS Checks --------------------------------------------------
- AC_ISC_POSIX
-@@ -1280,6 +1227,7 @@
- AC_MSG_RESULT(using $SHELL (FORCED))
+ dnl headers:
+
+@@ -549,7 +396,6 @@
+ dnl A/UX uses this...
+ AC_CHECK_LIB(posix, getpwent, [LIBS="$LIBS -lposix"])
+
+- dnl use old-style shared libs if we have 'em.
+ AC_CHECK_LIB(socket_s, socket, [LIBS="$LIBS -lsocket_s"; have_socket=1], ,-lnsl)
+ if test -z "$have_socket"; then
+ AC_CHECK_LIB(socket, socket, [LIBS="$LIBS -lsocket"], , -lnsl)
+@@ -1007,8 +853,8 @@
+ dnl ----------------------------------------------------------------------------
+ dnl check to see if you have getpgrp(0) or getpgrp()
+ dnl
+-dnl POSIX `getpgrp(void)' define HAVE_GETPGRP_0
+-dnl BSD `getpgrp(int)' - takes 0 as argument
++dnl POSIX getpgrp(void) define HAVE_GETPGRP_0
++dnl BSD getpgrp(int) - takes 0 as argument
+ dnl define HAVE_GETPGRP_0 0
+
+ dnl check to see if you have getpgrp(0) or getpgrp()
+@@ -1055,11 +901,11 @@
- dnl ----------------- Option for enabling GNU gettext --------------------
+ dnl ----------------------------------------------------------------------------
+ dnl just for (really) backwards compatibility
+-dnl we really try not to use union wait -- it's heinously unportable.
++dnl we really try not to use union wait -- it is heinously unportable.
+ dnl nicked this check from Tcl as well. ;
+ dnl
+ dnl The check below checks whether <sys/wait.h> defines the type
+-dnl "union wait" correctly. It's needed because of weirdness in
++dnl "union wait" correctly. It is needed because of weirdness in
+ dnl HP-UX where "union wait" is defined in both the BSD and SYS-V
+ dnl environments. Checking the usability of WIFEXITED seems to do
+ dnl the trick.
+@@ -1307,41 +1153,9 @@
+
+ AC_PROG_MAKE_SET
+
+-dnl ----------------- force this to be Bourne Shell for now ---------------
+-AC_MSG_CHECKING(for shell)
+-SHELL=/bin/sh
+-AC_MSG_RESULT(using $SHELL (FORCED))
+-
+ALL_LINGUAS="fr"
AM_GNU_GETTEXT
+-AC_MSG_RESULT([LIBS $LIBS, INTLLIBS $INTLLIBS])
+- if test "${USE_NLS}" = yes; then
+- AC_MSG_RESULT([Using NLS, localedir ${LOCALEDIR}, need intl/libintl.a - "${USE_INCLUDED_LIBINTL}" ])
+- if test "${USE_INCLUDED_LIBINTL}" = yes ; then
+- CPPFLAGS="$CPPFLAGS -I \${top_builddir}/intl"
+- AC_MSG_RESULT([using \${top_builddir}/intl])
+- if test "$nls_cv_force_use_gnu_gettext" = no ; then
+- echo "NLS enabled and requested system gettext support not available."
+- echo " You may need to use:"
+- echo " configure '--with-cppopts=-I/usr/local/include' '--with-ldopts=-L/usr/local/lib'"
+- echo " See ${srcdir}/ABOUT-NLS.LPRng in the LPRng distribution for details."
+- exit 1;
+- fi
+- if test ! -f ${srcdir}/intl/gettext.h ; then
+- echo "gettext code is not in the ${srcdir}/intl directory."
+- echo "See ${srcdir}/ABOUT-NLS.LPRng in the LPRng distribution for details."
+- exit 1;
+- fi
+- fi
+- LIBS="$INTLLIBS $LIBS"
+- else
+- AC_MSG_RESULT([No NLS])
+- fi
+- if test "$XGETTEXT" = "" ; then
+- XGETTEXT=xgettext;
+- fi
+- AC_MSG_RESULT(using XGETTEXT $XGETTEXT)
+-
dnl ----------------------------------------------------------------------------
-@@ -1396,9 +1344,7 @@
+ dnl ----------------- END OF GENERAL CONFIGURATION ---------------------------
+
+@@ -1393,12 +1207,12 @@
+ found=
+ if test "$found" = "" ; then
+ LIBS=" -lcrypto -lcom_err $SAVELIBS"
+- AC_CHECKING(for krb5_des_string_to_key in $LIBS, )
++ AC_MSG_NOTICE([for krb5_des_string_to_key in $LIBS])
+ AC_TRY_LINK_FUNC(krb5_des_string_to_key,found="yes")
+ fi;
+ if test "$found" = "" ; then
+ LIBS=" -lk5crypto -lcom_err $SAVELIBS"
+- AC_CHECKING(for krb5_des_string_to_keyin $LIBS, )
++ AC_MSG_NOTICE([for krb5_des_string_to_keyin $LIBS])
+ AC_TRY_LINK_FUNC(krb5_des_string_to_key,found="yes")
+ fi;
+ if test "$found" = "" ; then
+@@ -1413,7 +1227,7 @@
+ found=
+ if test "$found" = "" ; then
+ LIBS=" -lkrb5 $SAVELIBS"
+- AC_CHECKING(for krb5_init_context in $LIBS, )
++ AC_CHECKING([for krb5_init_context in $LIBS])
+ AC_TRY_LINK_FUNC(krb5_init_context,found="yes")
+ fi;
+ if test "$found" = "" ; then
+@@ -1427,12 +1241,12 @@
+ found=;
+ if test "$found" = "" ; then
+ LIBS=" -lkrb4 -ldes425 $SAVELIBS"
+- AC_CHECKING(for krb_recvauth in $LIBS, )
++ AC_CHECKING([for krb_recvauth in $LIBS])
+ AC_TRY_LINK_FUNC(krb5_init_context,found="yes")
+ fi;
+ if test "$found" = "" ; then
+ LIBS=" -lkrb4 -ldes $SAVELIBS"
+- AC_CHECKING(for krb_recvauth in $LIBS, )
++ AC_CHECKING([for krb_recvauth in $LIBS])
+ AC_TRY_LINK_FUNC(krb5_init_context,found="yes")
+ fi;
+ if test "$found" = "" ; then
+@@ -1501,12 +1315,7 @@
dnl ----------------- START OF OUTPUT ------------------------------------------
- AC_OUTPUT(
+
+-if test "$ac_cv_prog_gcc" = yes; then
+- CFLAGS="$CFLAGS -Wall -Werror"
+-fi;
-
+-AC_OUTPUT(
+-[
++AC_OUTPUT([
Makefile
--Makefile.bsd
HOWTO/Makefile
TESTSUPPORT/Makefile
- DISTRIBUTIONS/Makefile
-@@ -1421,23 +1367,13 @@
- UTILS/test_read
- UTILS/test_read
- intl/Makefile
--intl/intlh.inst
--intl/po2tbl.sed
- lpd.perms
- printcap
- man/Makefile
- po/Makefile.in
--po/POTFILES
- src/Makefile
- src/pclbanner
+@@ -1535,29 +1344,23 @@
src/psbanner
+ po/Makefile.in
+ intl/Makefile
+-],
+-[
+-for i in \
+-UTILS/LPRng.pm \
+-UTILS/accounting.pl \
+-UTILS/decode_args_with_perl \
+-UTILS/decode_args_with_sh \
+-UTILS/fixid \
+-UTILS/fixupdate \
+-UTILS/lpq_in_perl \
+-UTILS/lpr_in_perl \
+-UTILS/lprm_in_perl \
+-UTILS/make_lpd_conf \
+-UTILS/make_printcap_use \
+-UTILS/makeinc \
+-UTILS/read_conf \
+-UTILS/remote_active \
+-UTILS/test_read \
+-UTILS/update_z.pl \
+-; do chmod +x $i ; done
+-]
-
-- ,[
-- for i in po/Makefile ; do
-- if test -f $i; then chmod +w $i; fi;
-- cp po/Makefile.in $i;
-- done;
-- ]
- )
+-)
++UTILS/LPRng.pm
++UTILS/accounting.pl
++UTILS/decode_args_with_perl
++UTILS/decode_args_with_sh
++UTILS/fixid
++UTILS/fixupdate
++UTILS/lpq_in_perl
++UTILS/lpr_in_perl
++UTILS/lprm_in_perl
++UTILS/make_lpd_conf
++UTILS/make_printcap_use
++UTILS/makeinc
++UTILS/read_conf
++UTILS/remote_active
++UTILS/test_read
++UTILS/update_z.pl
++])
dnl ----------------------------------------------------------------------------
-diff -Nru LPRng-3.6.26/man/Makefile.in LPRng-3.6.26.new/man/Makefile.in
---- LPRng-3.6.26/man/Makefile.in Fri Oct 13 17:08:41 2000
-+++ LPRng-3.6.26.new/man/Makefile.in Mon Oct 16 21:13:21 2000
-@@ -22,8 +22,8 @@
-
- ## fix up prefix to be a make variable
- prefix = @prefix@
--MAN = @mandir@
--SHELL = @SHELL@
-+mandir = @mandir@
-+SHELL = @SHELL@
-
- # Install man pages in compressed form.
- # COMPRESS = compression utility
-@@ -61,25 +61,25 @@
- install:
- for suffix in 1 5 8 ; do \
- if [ ! -d $(INSTALL_PREFIX)$(MAN)/man$${suffix} ] ; then \
-- echo ${SRC}/mkinstalldirs $(INSTALL_PREFIX)$(MAN)/man$${suffix}; \
-- ${SRC}/mkinstalldirs $(INSTALL_PREFIX)$(MAN)/man$${suffix}; \
-+ echo ${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man$${suffix}; \
-+ ${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man$${suffix}; \
- fi; \
- for i in ${SRC}/*.$$suffix; do \
-- echo $(INSTALL) -m 644 $$i $(INSTALL_PREFIX)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
-- $(INSTALL) -m 644 $$i $(INSTALL_PREFIX)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
-+ echo $(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(MANEXT); \
-+ $(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(MANEXT); \
- done; \
- done;
- install.zman:
- for suffix in 1 5 8 ; do \
-- if [ ! -d $(INSTALL_PREFIX)$(MAN)/man$${suffix} ] ; then \
-- echo ${SRC}/mkinstalldirs $(INSTALL_PREFIX)$(MAN)/man$${suffix}$(COMPRESS_DIR); \
-- ${SRC}/mkinstalldirs $(INSTALL_PREFIX)$(MAN)/man$${suffix}$(COMPRESS_DIR); \
-+ if [ ! -d $(DESTDIR)$(mandir)/man$${suffix} ] ; then \
-+ echo ${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man$${suffix}$(COMPRESS_DIR); \
-+ ${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man$${suffix}$(COMPRESS_DIR); \
- fi; \
- for i in ${SRC}/*.$$suffix; do \
- echo $(COMPRESS) $$i ; \
- $(COMPRESS) < $$i >_; \
-- echo $(INSTALL) -m 644 _ $(INSTALL_PREFIX)$(MAN)/man$${suffix}$(COMPRESS_DIR)/`basename $$i`$(COMPRESS_EXT) ; \
-- $(INSTALL) -m 644 _ $(INSTALL_PREFIX)$(MAN)/man$${suffix}$(COMPRESS_DIR)/`basename $$i`$(COMPRESS_EXT) ; \
-+ echo $(INSTALL) -m 644 _ $(DESTDIR)$(mandir)/man$${suffix}$(COMPRESS_DIR)/`basename $$i`$(COMPRESS_EXT) ; \
-+ $(INSTALL) -m 644 _ $(DESTDIR)$(mandir)/man$${suffix}$(COMPRESS_DIR)/`basename $$i`$(COMPRESS_EXT) ; \
- rm _; \
- done; \
- done;
-@@ -87,15 +87,15 @@
- uninstall:
- for suffix in 1 5 8 ; do \
- for i in ${SRC}/*.$$suffix; do \
-- echo rm $(INSTALL_PREFIX)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
-- rm $(INSTALL_PREFIX)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
-+ echo rm $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(MANEXT); \
-+ rm $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(MANEXT); \
- done; \
- done;
- uninstall.zman:
- for suffix in 1 5 8 ; do \
- for i in ${SRC}/*.$$suffix; do \
-- echo rm -f $(INSTALL_PREFIX)$(MAN)/man$${suffix}$(COMPRESS_DIR)/`basename $$i`$(COMPRESS_EXT) ; \
-- rm -f $(INSTALL_PREFIX)$(MAN)/man$${suffix}$(COMPRESS_DIR)/`basename $$i`$(COMPRESS_EXT) ; \
-+ echo rm -f $(DESTDIR)$(mandir)/man$${suffix}$(COMPRESS_DIR)/`basename $$i`$(COMPRESS_EXT) ; \
-+ rm -f $(DESTDIR)$(mandir)/man$${suffix}$(COMPRESS_DIR)/`basename $$i`$(COMPRESS_EXT) ; \
- done; \
- done;
-
-diff -Nru LPRng-3.6.26/src/Makefile.in LPRng-3.6.26.new/src/Makefile.in
---- LPRng-3.6.26/src/Makefile.in Mon Oct 16 21:11:58 2000
-+++ LPRng-3.6.26.new/src/Makefile.in Mon Oct 16 21:11:30 2000
+ dnl ----------------- END OF OUTPUT --------------------------------------------
+--- LPRng-3.8.1/src/Makefile.in~ Fri Nov 16 17:01:32 2001
++++ LPRng-3.8.1/src/Makefile.in Sun Nov 18 23:24:17 2001
@@ -47,9 +47,6 @@
SHELL_PATH=@SHELL@
SHELL = @SHELL@
-LDCC=@LDCC@
-
# any libs that need to be used to get these programs to compile:
- LIBS=@LIBS@
+ LIBS= @LIBS@
+
+@@ -71,8 +71,6 @@
-@@ -98,8 +95,6 @@
- CFLAGS:= @CPPFLAGS@ @CFLAGS@ @DEFS@ -DLOCALEDIR=\"$(localedir)\" $(CFLAGS)
- LDFLAGS:= @LDFLAGS@
+ # install options
-STRIP=@STRIP@
+-
+ CFLAGS:= \
+ -I${top_builddir} \
+ -I${SRC}/include -I${SRC}/common \
+@@ -98,8 +96,6 @@
+ FILTER_DIR = @FILTER_DIR@
+ LPD_DIR = @LPD_DIR@
+
+-STRIP = @STRIP@
-
#********************** End of configure modifiable settings ************
-@@ -320,38 +315,38 @@
- $(RANLIB) $@
-
- lpd: $(LPD_OBJS) liblpr.a
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- lpr: $(LPR_OBJS) liblpr.a
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- lpq: $(LPQ_OBJS) liblpr.a
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- lpstat: $(LPSTAT_OBJS) liblpr.a
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- lprm: $(LPRM_OBJS) liblpr.a
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- lpc: $(LPC_OBJS) liblpr.a
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- checkpc: $(CHECKPC_OBJS) liblpr.a
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- lpf: $(LPF_OBJS)
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- lpraccnt: $(LPRACCNT_OBJS) liblpr.a
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- lpbanner: $(LPBANNER_OBJS)
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- monitor: $(MONITOR_OBJS) liblpr.a
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-
- authenticate_pgp: ${SRC}/AUTHENTICATE/authenticate_pgp.sh
- rm -f $@; cp $^ $@; chmod 555 $@
-
- #ptest: common/plp_snprintf.c
--# $(LDCC) $(CFLAGS) -DTEST -o ptest common/plp_snprintf.c
-+# $(CC) $(CFLAGS) -DTEST -o ptest common/plp_snprintf.c
-
- sserver: sserver.o liblpr.a
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
- sclient: sclient.o liblpr.a
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-
- sendauth.o lpd_secure.o : user_auth.stub
-
-@@ -395,31 +390,31 @@
+@@ -187,7 +184,7 @@
+ ########################################################################
- install: all
- echo "SETUID_ROOT IS ${PERMS}, PERMS $(ROOT_PERMS)";
-- for i in ${INSTALL_PREFIX}${bindir} ${INSTALL_PREFIX}${sbindir} \
-- ${INSTALL_PREFIX}${sysconfdir} \
-- ${INSTALL_PREFIX}${LPD_DIR} ${INSTALL_PREFIX}${FILTER_DIR}; do \
-+ for i in $(DESTDIR)$(bindir) $(DESTDIR)${sbindir} \
-+ $(DESTDIR)${sysconfdir} \
-+ $(DESTDIR)${LPD_DIR} $(DESTDIR)${FILTER_DIR}; do \
- if [ ! -d $$i ] ; then ${SRC}/mkinstalldirs $$i ; fi; \
+ .SUFFIXES: .lo
+-LINK = $(LIBTOOL) --mode=link $(LDCC) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@
+ .c.lo:
+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $<
+
+@@ -310,17 +306,17 @@
done;
-- ${INSTALLCMD} ${STRIP} -m $(ROOT_PERMS) lpq ${INSTALL_PREFIX}${bindir}
-- ${INSTALLCMD} ${STRIP} -m $(ROOT_PERMS) lprm ${INSTALL_PREFIX}${bindir}
-- ${INSTALLCMD} ${STRIP} -m $(ROOT_PERMS) lpr ${INSTALL_PREFIX}${bindir}
-- ${INSTALLCMD} ${STRIP} -m $(ROOT_PERMS) lpstat ${INSTALL_PREFIX}${bindir}
-- ${INSTALLCMD} ${STRIP} -m $(ROOT_PERMS) lpc ${INSTALL_PREFIX}${sbindir}
-- ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpd ${INSTALL_PREFIX}${LPD_DIR}
-- ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpf ${INSTALL_PREFIX}${FILTER_DIR}
-- ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpbanner ${INSTALL_PREFIX}${FILTER_DIR}
-- ${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${INSTALL_PREFIX}${FILTER_DIR}
-- ${INSTALLCMD} -m $(NORM_PERMS) psbanner ${INSTALL_PREFIX}${FILTER_DIR}
-- ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) checkpc ${INSTALL_PREFIX}${sbindir}
-- ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpraccnt ${INSTALL_PREFIX}${sbindir}
-- cd ${INSTALL_PREFIX}${bindir}; rm -f lp cancel; ln -s lpr lp; ln -s lprm cancel;
-+ ${INSTALLCMD} -m $(ROOT_PERMS) lpq $(DESTDIR)$(bindir)
-+ ${INSTALLCMD} -m $(ROOT_PERMS) lprm $(DESTDIR)$(bindir)
-+ ${INSTALLCMD} -m $(ROOT_PERMS) lpr $(DESTDIR)$(bindir)
-+ ${INSTALLCMD} -m $(ROOT_PERMS) lpstat $(DESTDIR)$(bindir)
-+ ${INSTALLCMD} -m $(ROOT_PERMS) lpc $(DESTDIR)${sbindir}
-+ ${INSTALLCMD} -m $(NORM_PERMS) lpd $(DESTDIR)${LPD_DIR}
-+ ${INSTALLCMD} -m $(NORM_PERMS) lpf $(DESTDIR)${FILTER_DIR}
-+ ${INSTALLCMD} -m $(NORM_PERMS) lpbanner $(DESTDIR)${FILTER_DIR}
-+ ${INSTALLCMD} -m $(NORM_PERMS) pclbanner $(DESTDIR)${FILTER_DIR}
-+ ${INSTALLCMD} -m $(NORM_PERMS) psbanner $(DESTDIR)${FILTER_DIR}
-+ ${INSTALLCMD} -m $(NORM_PERMS) checkpc $(DESTDIR)${sbindir}
-+ ${INSTALLCMD} -m $(NORM_PERMS) lpraccnt $(DESTDIR)${sbindir}
-+ cd $(DESTDIR)$(bindir); rm -f lp cancel; ln -s lpr lp; ln -s lprm cancel;
+ ${LIBTOOL} --mode=install $(INSTALLCMD) liblpr.la $(DESTDIR)$(libdir)/liblpr.la
+- ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpq ${DESTDIR}${bindir}
+- ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lprm ${DESTDIR}${bindir}
+- ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpr ${DESTDIR}${bindir}
+- ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}
+- ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}
+- ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR}
+- ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR}
+- ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR}
+- ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR}
+- ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR}
+- ${LIBTOOL} --mode=install ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir}
++ ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lpq ${DESTDIR}${bindir}
++ ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lprm ${DESTDIR}${bindir}
++ ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lpr ${DESTDIR}${bindir}
++ ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}
++ ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}
++ ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR}
++ ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR}
++ ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR}
++ ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR}
++ ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR}
++ ${LIBTOOL} --mode=install ${INSTALLCMD} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir}
+ cd ${DESTDIR}${bindir}; rm -f lp cancel; ln -s lpr lp; ln -s lprm cancel;
uninstall:
-- rm -f ${INSTALL_PREFIX}${LPD_DIR}/lpd
-- cd ${INSTALL_PREFIX}${FILTER_DIR}; rm -f lpf lpbanner pclbanner psbanner
-- cd ${INSTALL_PREFIX}${bindir}; rm -f lp lpq lpstat lpr lp cancel;
-- cd ${INSTALL_PREFIX}${sbindir}; rm -f lpc checkpc lpraccnt;
-+ rm -f $(DESTDIR)${LPD_DIR}/lpd
-+ cd $(DESTDIR)${FILTER_DIR}; rm -f lpf lpbanner pclbanner psbanner
-+ cd $(DESTDIR)$(bindir); rm -f lp lpq lpstat lpr lp cancel;
-+ cd $(DESTDIR)${sbindir}; rm -f lpc checkpc lpraccnt;
+--- LPRng-3.8.1/Makefile.in~ Mon Nov 19 00:56:23 2001
++++ LPRng-3.8.1/Makefile.in Mon Nov 19 00:56:23 2001
+@@ -46,9 +46,7 @@
+ LOCKFILE=\"@LOCKFILE@\"
+ PSHOWALL="@PSHOWALL@"
+ FILTER_DIR=@FILTER_DIR@
+-LOCALEDIR=@LOCALEDIR@
+ INIT=@INIT@
+-USE_NLS=@USE_NLS@
+ USE_GDBM=@USE_GDBM@
+ LIBTOOL=@LIBTOOL@
+
+@@ -111,12 +109,6 @@
+ MAKETARGET=all
+ ###############################################################################
+-$(ALLDIRS):
+- if [ "$@" != po -o "$(USE_NLS)" != "no" ] ; then \
+- cd $@; $(MAKE) localedir=${DESTDIR}${LOCALEDIR} \
+- DESTDIR=$(DESTDIR) $(MAKETARGET) ; \
+- fi
+-
+ TAGS clean::
+ -$(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(DIRS)
+
+@@ -125,7 +117,9 @@
+ -rm -f *.bak ? ?.* core *.old
+
+ install: all
+- $(MAKE) MAKETARGET=$@ DESTDIR=$(DESTDIR) $(INSTALLDIRS)
++ for i in $(INSTALLDIRS); do \
++ $(MAKE) install DESTDIR=$(DESTDIR) -C $$i; \
++ done
- ###########################################################################
+ if [ "${POSTINSTALL}" != "NO" -a "${POSTINSTALL}" != "no" ] ; then \
+ MAKEINSTALL=YES DESTDIR=$(DESTDIR) $(SHELL) postinstall ; \