-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$
+diff -Nru LPRng-3.7.1/configure.in LPRng-3.7.1.new/configure.in
+--- LPRng-3.7.1/configure.in Wed Nov 29 08:14:08 2000
++++ LPRng-3.7.1.new/configure.in Wed Nov 29 07:39:43 2000
+@@ -6,54 +6,21 @@
+ dnl ----------------- START OF GENERAL CONFIGURATION ---------------------------
+ AC_INIT(Makefile.in)
-PACKAGE=LPRng
--VERSION=3.6.26
+-VERSION=3.7.1
-
- dnl ----------------------------------------------------------------------------
- dnl ----------------- START OF GENERAL CONFIGURATION ---------------------------
- AC_INIT(Makefile.in)
-AC_CONFIG_AUX_DIR(.)
AC_CANONICAL_SYSTEM
AC_CONFIG_HEADER(config.h)
-AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
-ALL_LINGUAS="fr"
--
++AM_INIT_AUTOMAKE(LPRng, 3.7.1)
+
-AC_PREFIX_DEFAULT(/usr/local)
-AC_SUBST(INSTALL)
-AC_SUBST(INSTALL_MAN)
-AC_SUBST(CPPFLAGS)
-AC_SUBST(LDFLAGS)
-AC_SUBST(LDCC)
-+AM_INIT_AUTOMAKE(LPRng, 3.6.26)
++ALL_LINGUAS="fr"
dnl check for awk
AC_PROG_AWK
-AC_SUBST(AWK)
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
+-
+-
+-
dnl ----------------------------------------------------------------------------
dnl ----------- XXXXXX START OF OPTIONS ----------------------------------------
-@@ -299,37 +272,11 @@
+
+@@ -331,38 +298,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 @@
+@@ -1316,38 +1256,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 ---------------------------
+
+@@ -1483,7 +1394,6 @@
+
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
+@@ -1513,28 +1423,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
+diff -Nru LPRng-3.7.1/man/Makefile.in LPRng-3.7.1.new/man/Makefile.in
+--- LPRng-3.7.1/man/Makefile.in Wed Nov 29 08:14:08 2000
++++ LPRng-3.7.1.new/man/Makefile.in Wed Nov 29 07:29:03 2000
@@ -22,8 +22,8 @@
## fix up prefix to be a make variable
# Install man pages in compressed form.
# COMPRESS = compression utility
-@@ -61,25 +61,25 @@
+@@ -61,13 +61,13 @@
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}; \
+ 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; \
- 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); \
+@@ -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; \
- 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 @@
+diff -Nru LPRng-3.7.1/src/Makefile.in LPRng-3.7.1.new/src/Makefile.in
+--- LPRng-3.7.1/src/Makefile.in Wed Nov 29 08:14:08 2000
++++ LPRng-3.7.1.new/src/Makefile.in Wed Nov 29 08:14:29 2000
+@@ -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,15 +48,9 @@
SHELL_PATH=@SHELL@
SHELL = @SHELL@
-LDCC=@LDCC@
-
# any libs that need to be used to get these programs to compile:
- LIBS=@LIBS@
+ LIBS=@INTLLIBS@ @LIBS@
-@@ -98,8 +95,6 @@
- CFLAGS:= @CPPFLAGS@ @CFLAGS@ @DEFS@ -DLOCALEDIR=\"$(localedir)\" $(CFLAGS)
- LDFLAGS:= @LDFLAGS@
+-# add path to internationalization
+-INTLINCS=@INTLINCS@
+-
+ ### PATHS ####
+ # prefix
+ prefix=@prefix@
+@@ -72,10 +67,8 @@
+
+ # install options
-STRIP=@STRIP@
+-
+ CFLAGS:= @CPPFLAGS@ @CFLAGS@ @DEFS@ \
+- -I.. -I${SRC}/include -I${SRC}/common @INTLINCS@ \
++ -I.. -I${SRC}/include -I${SRC}/common \
+ -DCHOWN=\"@CHOWN@\" \
+ -DCHGRP=\"@CHGRP@\" \
+ -DPRINTCAP_PATH=\"@PRINTCAP_PATH@\" \
+@@ -88,17 +81,14 @@
+ -DLOCKFILE=\"@LOCKFILE@\" \
+ -DCLEAR=\"@CLEAR@\" \
+ -DUSERID=\"@USERID@\" \
+- -DGROUPID=\"@GROUPID@\" \
+- -DLOCALEDIR=\"@LOCALEDIR@\"
+-
++ -DGROUPID=\"@GROUPID@\" \
++ -DLOCALEDIR=\"$(datadir)/locale\"
+
+ USER_OBJS := @USER_OBJS@
+ LDFLAGS := @LDFLAGS@
+ FILTER_DIR = @FILTER_DIR@
+ LPD_DIR = @LPD_DIR@
+
+-STRIP = @STRIP@
-
#********************** End of configure modifiable settings ************
-@@ -320,38 +315,38 @@
+@@ -175,7 +165,7 @@
+
+
+ SRCDIRS=${SRC}/common ${SRC}/AUTHENTICATE
+-INCLUDE=.. ${SRC}/include ${INTLINCS}
++INCLUDE=.. ${SRC}/include
+
+ VPATH=..:.:${SRC}/include:${SRC}/common
+
+@@ -241,33 +231,33 @@
$(RANLIB) $@
lpd: $(LPD_OBJS) liblpr.a
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+- $(LDCC) $(LDFLAGS) -o $@ ${LPD_OBJS} liblpr.a $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ ${LPD_OBJS} liblpr.a $(LIBS)
lpr: $(LPR_OBJS) liblpr.a
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+- $(LDCC) $(LDFLAGS) -o $@ ${LPR_OBJS} liblpr.a $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ ${LPR_OBJS} liblpr.a $(LIBS)
lpq: $(LPQ_OBJS) liblpr.a
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+- $(LDCC) $(LDFLAGS) -o $@ ${LPQ_OBJS} liblpr.a $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ ${LPQ_OBJS} liblpr.a $(LIBS)
lpstat: $(LPSTAT_OBJS) liblpr.a
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+- $(LDCC) $(LDFLAGS) -o $@ ${LPSTAT_OBJS} liblpr.a $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ ${LPSTAT_OBJS} liblpr.a $(LIBS)
lprm: $(LPRM_OBJS) liblpr.a
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+- $(LDCC) $(LDFLAGS) -o $@ ${LPRM_OBJS} liblpr.a $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ ${LPRM_OBJS} liblpr.a $(LIBS)
lpc: $(LPC_OBJS) liblpr.a
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+- $(LDCC) $(LDFLAGS) -o $@ ${LPC_OBJS} liblpr.a $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ ${LPC_OBJS} liblpr.a $(LIBS)
checkpc: $(CHECKPC_OBJS) liblpr.a
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+- $(LDCC) $(LDFLAGS) -o $@ ${CHECKPC_OBJS} liblpr.a $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ ${CHECKPC_OBJS} liblpr.a $(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)
+- $(LDCC) $(LDFLAGS) -o $@ ${LPF_OBJS} $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ ${LPF_OBJS} $(LIBS)
lpbanner: $(LPBANNER_OBJS)
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+- $(LDCC) $(LDFLAGS) -o $@ ${LPBANNER_OBJS} $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ ${LPBANNER_OBJS} $(LIBS)
monitor: $(MONITOR_OBJS) liblpr.a
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+- $(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 $^ $@; 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
+ rm -f $@; cp ${SRC}/AUTHENTICATE/authenticate_pgp.sh $@; chmod 555 $@
sserver: sserver.o liblpr.a
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+- $(LDCC) $(LDFLAGS) -o $@ sserver.o liblpr.a $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ sserver.o liblpr.a $(LIBS)
sclient: sclient.o liblpr.a
-- $(LDCC) $(LDFLAGS) -o $@ $^ $(LIBS)
-+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+- $(LDCC) $(LDFLAGS) -o $@ sclient.o liblpr.a $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ sclient.o liblpr.a $(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 \
+@@ -304,17 +294,17 @@
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;
+- ${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:
-- 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;
-
-
- ###########################################################################
projects / packages / LPRng.git / blobdiff