-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
+--- LPRng-3.7.5/src/Makefile.in.wiget Wed Jan 10 01:59:06 2001
++++ LPRng-3.7.5/src/Makefile.in Tue Oct 9 14:53:05 2001
+@@ -33,7 +33,8 @@
+ @SET_MAKE@
+
+ # what C compiler to use.
+-CC:=@CC@
++CC=@CC@
++datadir=@datadir@
+
+ # what command to use to "ranlib" or "lorder" the library.
+ RANLIB=@RANLIB@
+@@ -47,14 +48,9 @@
+ SHELL_PATH=@SHELL@
+ SHELL = @SHELL@
+
+-# loader for c programs
+-LDCC=@LDCC@
-
- dnl ----------------------------------------------------------------------------
- dnl ----------------- START OF GENERAL CONFIGURATION ---------------------------
- AC_INIT(Makefile.in)
--AC_CONFIG_AUX_DIR(.)
+ # any libs that need to be used to get these programs to compile:
+-LIBS=@USE_GDBM_LIB@ @INTLLIBS@ @LIBS@
++LIBS=@LIBS@
+
+-# add path to internationalization
+-INTLINCS=@INTLINCS@
+
+ ### PATHS ####
+ # prefix
+@@ -72,12 +68,10 @@
+
+ # install options
+
+-STRIP=@STRIP@
+
+ CFLAGS:= @CPPFLAGS@ @CFLAGS@ @DEFS@ \
+ -I${top_builddir} \
+- -I${SRC}/include -I${SRC}/common @INTLINCS@ \
+- -I@USE_GDBM_INC_DIR@ \
++ -I${SRC}/include -I${SRC}/common \
+ -DCHOWN=\"@CHOWN@\" \
+ -DCHGRP=\"@CHGRP@\" \
+ -DPRINTCAP_PATH=\"@PRINTCAP_PATH@\" \
+@@ -91,16 +85,15 @@
+ -DCLEAR=\"@CLEAR@\" \
+ -DUSERID=\"@USERID@\" \
+ -DGROUPID=\"@GROUPID@\" \
+- -DLOCALEDIR=\"@LOCALEDIR@\"
++ -DLOCALEDIR=\"$(datadir)/locale\"
+
+
+ USER_OBJS := @USER_OBJS@
+-LDFLAGS := -L@USE_GDBM_LIB_DIR@ @LDFLAGS@
++LDFLAGS := @LDFLAGS@
+
+ FILTER_DIR = @FILTER_DIR@
+ LPD_DIR = @LPD_DIR@
+
+-STRIP = @STRIP@
+
+ #********************** End of configure modifiable settings ************
+
+@@ -178,7 +171,7 @@
+
+
+ SRCDIRS=${SRC}/common ${SRC}/AUTHENTICATE
+-INCLUDE=.. ${SRC}/include ${INTLINCS}
++INCLUDE=.. ${SRC}/include
+
+ VPATH=..:.:${SRC}/include:${SRC}/common
+
+@@ -244,33 +237,33 @@
+ $(RANLIB) $@
+
+ lpd: $(LPD_OBJS) liblpr.a
+- $(LDCC) $(LDFLAGS) -o $@ ${LPD_OBJS} liblpr.a $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ ${LPD_OBJS} liblpr.a $(LIBS)
+ lpr: $(LPR_OBJS) liblpr.a
+- $(LDCC) $(LDFLAGS) -o $@ ${LPR_OBJS} liblpr.a $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ ${LPR_OBJS} liblpr.a $(LIBS)
+ lpq: $(LPQ_OBJS) liblpr.a
+- $(LDCC) $(LDFLAGS) -o $@ ${LPQ_OBJS} liblpr.a $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ ${LPQ_OBJS} liblpr.a $(LIBS)
+ lpstat: $(LPSTAT_OBJS) liblpr.a
+- $(LDCC) $(LDFLAGS) -o $@ ${LPSTAT_OBJS} liblpr.a $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ ${LPSTAT_OBJS} liblpr.a $(LIBS)
+ lprm: $(LPRM_OBJS) liblpr.a
+- $(LDCC) $(LDFLAGS) -o $@ ${LPRM_OBJS} liblpr.a $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ ${LPRM_OBJS} liblpr.a $(LIBS)
+ lpc: $(LPC_OBJS) liblpr.a
+- $(LDCC) $(LDFLAGS) -o $@ ${LPC_OBJS} liblpr.a $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ ${LPC_OBJS} liblpr.a $(LIBS)
+ checkpc: $(CHECKPC_OBJS) liblpr.a
+- $(LDCC) $(LDFLAGS) -o $@ ${CHECKPC_OBJS} liblpr.a $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ ${CHECKPC_OBJS} liblpr.a $(LIBS)
+ lpf: $(LPF_OBJS)
+- $(LDCC) $(LDFLAGS) -o $@ ${LPF_OBJS} $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ ${LPF_OBJS} $(LIBS)
+ lpbanner: $(LPBANNER_OBJS)
+- $(LDCC) $(LDFLAGS) -o $@ ${LPBANNER_OBJS} $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ ${LPBANNER_OBJS} $(LIBS)
+ monitor: $(MONITOR_OBJS) liblpr.a
+- $(LDCC) $(LDFLAGS) -o $@ ${MONITOR_OBJS} liblpr.a $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ ${MONITOR_OBJS} liblpr.a $(LIBS)
+
+ authenticate_pgp: ${SRC}/AUTHENTICATE/authenticate_pgp.sh
+ rm -f $@; cp ${SRC}/AUTHENTICATE/authenticate_pgp.sh $@; chmod 555 $@
+
+ sserver: sserver.o liblpr.a
+- $(LDCC) $(LDFLAGS) -o $@ sserver.o liblpr.a $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ sserver.o liblpr.a $(LIBS)
+ sclient: sclient.o liblpr.a
+- $(LDCC) $(LDFLAGS) -o $@ sclient.o liblpr.a $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ sclient.o liblpr.a $(LIBS)
+
+ sendauth.o lpd_secure.o : user_auth.stub
+
+@@ -307,17 +300,17 @@
+ if [ ! -d $$i ] ; then ${SRC}/mkinstalldirs $$i ; fi; \
+ done;
+
+- ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpq ${DESTDIR}${bindir}
+- ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lprm ${DESTDIR}${bindir}
+- ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpr ${DESTDIR}${bindir}
+- ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}
+- ${INSTALLCMD} ${STRIP} -m $(@PERMS@) lpc ${DESTDIR}${sbindir}
+- ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpd ${DESTDIR}${LPD_DIR}
+- ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpf ${DESTDIR}${FILTER_DIR}
+- ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpbanner ${DESTDIR}${FILTER_DIR}
+- ${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${DESTDIR}${FILTER_DIR}
+- ${INSTALLCMD} -m $(NORM_PERMS) psbanner ${DESTDIR}${FILTER_DIR}
+- ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) checkpc ${DESTDIR}${sbindir}
++ ${INSTALLCMD} -m $(@PERMS@) lpq ${DESTDIR}${bindir}
++ ${INSTALLCMD} -m $(@PERMS@) lprm ${DESTDIR}${bindir}
++ ${INSTALLCMD} -m $(@PERMS@) lpr ${DESTDIR}${bindir}
++ ${INSTALLCMD} -m $(@PERMS@) lpstat ${DESTDIR}${bindir}
++ ${INSTALLCMD} -m $(@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}
+ cd ${DESTDIR}${bindir}; rm -f lp cancel; ln -s lpr lp; ln -s lprm cancel;
+
+ uninstall:
+--- LPRng-3.7.5/man/Makefile.in.wiget Mon Jan 8 20:19:50 2001
++++ LPRng-3.7.5/man/Makefile.in Tue Oct 9 14:53:05 2001
+@@ -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,13 +61,13 @@
+ install:
+ for suffix in 1 2 3 4 5 6 7 8 ; do \
+ if ls ${SRC}/*.$${suffix} >/dev/null 2>&1 ; then \
+- if [ ! -d $(DESTDIR)$(MAN)/man$${suffix} ] ; then \
+- echo ${SRC}/mkinstalldirs $(DESTDIR)$(MAN)/man$${suffix}; \
+- ${SRC}/mkinstalldirs $(DESTDIR)$(MAN)/man$${suffix}; \
++ if [ ! -d $(DESTDIR)$(mandir)/man$${suffix} ] ; then \
++ 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 $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
+- $(INSTALL) -m 644 $$i $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
++ echo $(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
++ $(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
+ done; \
+ fi; \
+ done;
+@@ -76,8 +76,8 @@
+ for suffix in 1 2 3 4 5 6 7 8 ; do \
+ if ls ${SRC}/*.$${suffix} >/dev/null 2>&1 ; then \
+ for i in ${SRC}/*.$$suffix; do \
+- echo rm $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
+- rm $(DESTDIR)$(MAN)/man$$suffix/`basename $$i`$(MANEXT); \
++ echo rm $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(mandirEXT); \
++ rm $(DESTDIR)$(mandir)/man$$suffix/`basename $$i`$(MANEXT); \
+ done; \
+ fi; \
+ done;
+--- LPRng-3.7.5/configure.in.wiget Mon Jan 15 21:26:40 2001
++++ LPRng-3.7.5/configure.in Tue Oct 9 14:53:05 2001
+@@ -13,46 +13,13 @@
AC_CANONICAL_SYSTEM
AC_CONFIG_HEADER(config.h)
-AC_SUBST(CPPFLAGS)
-AC_SUBST(LDFLAGS)
-AC_SUBST(LDCC)
-+AM_INIT_AUTOMAKE(LPRng, 3.6.26)
++AM_INIT_AUTOMAKE(LPRng, 3.7.4)
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_LDOPTS dnl
-WITH_CPPOPTS dnl
-
+-if test -z "$LOCALEDIR" ; then
+- LOCALEDIR='$(prefix)/share/locale'
+-fi;
+-
+-WITH_LOCALEDIR 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 @@
+@@ -86,31 +53,6 @@
+ USE_GDBM_BUILD_DIR=`pwd`/db
+ USE_GDBM_LIB_DIR=`pwd`/db/.libs
+ USE_GDBM_INC_DIR=`pwd`/db
+- d=${srcdir}/${USE_GDBM}
+-# USE_GDBM=db-3.1.17
+-# USE_GDBM_LIB="-ldb"
+-# USE_GDBM_BUILD_DIR=`pwd`/db
+-# USE_GDBM_LIB_DIR=`pwd`/db
+-# USE_GDBM_INC_DIR=`pwd`/db
+-# d=${srcdir}/${USE_GDBM}/dist
+- if test "!" -d db ; then
+- mkdir db
+- fi
+- if test "!" -d ${d} ; then
+- echo "Missing $d";
+- exit 1
+- fi
+- e=`cd $d; pwd`
+- echo DIR $d is $e
+- f=$e/configure
+- if test "!" -f $f ; then
+- echo "Missing $f";
+- exit 1
+- fi
+- echo "#!/bin/sh
+-/bin/sh $f \"\$@\" --srcdir=$e
+-" >db/configure
+- chmod a+x db/configure
+ fi
+ AC_SUBST(USE_GDBM)dnl
+ AC_SUBST(USE_GDBM_LIB)dnl
+@@ -382,38 +324,11 @@
AC_MSG_RESULT($FILTER_DIR)
AC_SUBST(FILTER_DIR)
-)
-AC_MSG_RESULT($v)
-AC_SUBST(STRIP)
+-
-
dnl ----------------------------------------------------------------------------
dnl ----------- C compiler checks -----------------------------------------
dnl ----------------------------------------------------------------------------
dnl ------------ OS Checks --------------------------------------------------
AC_ISC_POSIX
-@@ -1280,6 +1227,7 @@
+@@ -1359,38 +1274,9 @@
+ SHELL=/bin/sh
AC_MSG_RESULT(using $SHELL (FORCED))
- dnl ----------------- Option for enabling GNU gettext --------------------
+ALL_LINGUAS="fr"
AM_GNU_GETTEXT
+- if test "${USE_NLS}" = yes; then
+- AC_MSG_CHECKING([Using NLS, localedir ${LOCALEDIR}, ])
+- if test "${USE_INCLUDED_LIBINTL}" = yes ; then
+- AC_MSG_RESULT([using the local libintl installation])
+- if test -f ${srcdir}/${nls_cv_header_libgt} ; then
+- INTLINCS='-I $(top_builddir)/intl'
+- else
+- AC_MSG_RESULT([NLS enabled, local libintl support is needed, and])
+- AC_MSG_RESULT([ source code is not in the ${srcdir}/intl directory.])
+- AC_MSG_RESULT([ See ${srcdir}/ABOUT-NLS.LPRng in the LPRng distribution for details.])
+- exit 1;
+- fi
+- else
+- AC_MSG_RESULT([using -lintl])
+- INTLLIBS=-lintl
+- fi
+- else
+- AC_MSG_RESULT([No NLS])
+- fi
+- if test "${USE_NLS}" != yes -o "${USE_INCLUDED_LIBINTL}" != yes ; then
+- nls_cv_header_intl=
+- nls_cv_header_libgt=
+- fi
+- if test "$XGETTEXT" = "" ; then
+- XGETTEXT=xgettext;
+- fi
+- AC_MSG_RESULT(using XGETTEXT $XGETTEXT)
+- AC_SUBST(INTLINCS)
+- AC_SUBST(INTLLIBS)
+-
dnl ----------------------------------------------------------------------------
-@@ -1396,9 +1344,7 @@
- dnl ----------------- START OF OUTPUT ------------------------------------------
+ dnl ----------------- END OF GENERAL CONFIGURATION ---------------------------
+
+@@ -1525,11 +1411,7 @@
+ fi;
+
+-if test "$USE_GDBM" != "" ; then
+- AC_CONFIG_SUBDIRS( db )
+-fi
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
+@@ -1558,28 +1440,22 @@
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
-@@ -47,9 +47,6 @@
- SHELL_PATH=@SHELL@
- SHELL = @SHELL@
-
--# loader for c programs
--LDCC=@LDCC@
--
- # any libs that need to be used to get these programs to compile:
- LIBS=@LIBS@
-
-@@ -98,8 +95,6 @@
- CFLAGS:= @CPPFLAGS@ @CFLAGS@ @DEFS@ -DLOCALEDIR=\"$(localedir)\" $(CFLAGS)
- LDFLAGS:= @LDFLAGS@
-
--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 @@
-
- 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; \
- 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;
-
- 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.7.5/Makefile.in.wiget Mon Jan 15 22:27:47 2001
++++ LPRng-3.7.5/Makefile.in Tue Oct 9 14:53:45 2001
+@@ -44,7 +44,6 @@
+ LOCKFILE=\"@LOCKFILE@\"
+ PSHOWALL="@PSHOWALL@"
+ FILTER_DIR=@FILTER_DIR@
+-LOCALEDIR=@LOCALEDIR@
+ INIT=@INIT@
+ USE_NLS=@USE_NLS@
+ USE_GDBM=@USE_GDBM@
+@@ -58,7 +57,7 @@
+ # ALLDIRS for other such as documentation
+ #=============================================================================
+-DIRS= UTILS ${USE_GDBM_BUILD_DIR} intl src po man
++DIRS= UTILS intl src po man
+ INSTALLDIRS= UTILS intl src po man
+ FILES=./postinstall ./preremove ./postremove ./lpd.conf
+ ALLDIRS= ${DIRS} ${SRC}/TESTSUPPORT ${SRC}/HOWTO ${SRC}/DISTRIBUTIONS
+@@ -113,7 +112,7 @@
+ ###############################################################################
+ $(ALLDIRS): FRC
+ if [ "$@" != po -o "$(USE_NLS)" != "no" ] ; then \
+- cd $@; $(MAKE) localedir=${DESTDIR}${LOCALEDIR} \
++ cd $@; $(MAKE) \
+ DESTDIR=$(DESTDIR) $(MAKETARGET) ; \
+ fi
- ###########################################################################
projects / packages / LPRng.git / blobdiff