1 diff -Nru LPRng-3.6.13/configure.in LPRng-3.6.13.new/configure.in
2 --- LPRng-3.6.13/configure.in Mon Feb 21 21:27:27 2000
3 +++ LPRng-3.6.13.new/configure.in Tue Feb 29 16:02:30 2000
6 dnl ----------------- Option for enabling GNU gettext --------------------
8 -test "$USE_NLS" = yes && LIBS="$LIBS -lintl"
10 dnl ----------------- GCC Compilation ----------------------------------
12 diff -Nru LPRng-3.6.13/man/Makefile.in LPRng-3.6.13.new/man/Makefile.in
13 --- LPRng-3.6.13/man/Makefile.in Mon Feb 21 21:28:15 2000
14 +++ LPRng-3.6.13.new/man/Makefile.in Tue Feb 29 16:02:30 2000
18 ## fix up prefix to be a make variable
29 # Standard man install target.
32 - -${SRC}/mkinstalldirs $(MAN)/man1 $(MAN)/man5 $(MAN)/man8
33 - for i in ${SRC}/*.1; do $(MANINSTCMD) $$i $(MAN)/man1/`basename $$i`$(MANEXT); done
34 - for i in ${SRC}/*.5; do $(MANINSTCMD) $$i $(MAN)/man5/`basename $$i`$(MANEXT); done
35 - for i in ${SRC}/*.8; do $(MANINSTCMD) $$i $(MAN)/man8/`basename $$i`$(MANEXT); done
36 + -${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8
37 + for i in ${SRC}/*.1; do $(MANINSTCMD) $$i $(DESTDIR)$(mandir)/man1/`basename $$i`$(MANEXT); done
38 + for i in ${SRC}/*.5; do $(MANINSTCMD) $$i $(DESTDIR)$(mandir)/man5/`basename $$i`$(MANEXT); done
39 + for i in ${SRC}/*.8; do $(MANINSTCMD) $$i $(DESTDIR)$(mandir)/man8/`basename $$i`$(MANEXT); done
41 # Install man pages in compressed form.
44 for i in ${SRC}/*.1; do compress < $$i >/tmp/_; \
45 - $(MANINSTCMD) /tmp/_ $(MAN)/man1.Z/$$i$(MANEXT); rm -f /tmp/_; done
46 + $(MANINSTCMD) /tmp/_ $(mandir)/man1.Z/$$i$(MANEXT); rm -f /tmp/_; done
47 for i in ${SRC}/*.5; do compress < $$i >/tmp/_; \
48 - $(MANINSTCMD) /tmp/_ $(MAN)/man5.Z/$$i$(MANEXT); rm -f /tmp/_; done
49 + $(MANINSTCMD) /tmp/_ $(mandir)/man5.Z/$$i$(MANEXT); rm -f /tmp/_; done
50 for i in ${SRC}/*.8; do compress < $$i >/tmp/_; \
51 - $(MANINSTCMD) /tmp/_ $(MAN)/man8.Z/$$i$(MANEXT); rm -f /tmp/_; done
52 + $(MANINSTCMD) /tmp/_ $(mandir)/man8.Z/$$i$(MANEXT); rm -f /tmp/_; done
55 - for i in *.1; do rm -f $(MAN)/man1/$$i$(MANEXT); done
56 - for i in *.5; do rm -f $(MAN)/man5/$$i$(MANEXT); done
57 - for i in *.8; do rm -f $(MAN)/man8/$$i$(MANEXT); done
58 + for i in *.1; do rm -f $(mandir)/man1/$$i$(MANEXT); done
59 + for i in *.5; do rm -f $(mandir)/man5/$$i$(MANEXT); done
60 + for i in *.8; do rm -f $(mandir)/man8/$$i$(MANEXT); done
62 realclean mostlyclean distclean:: clean
64 diff -Nru LPRng-3.6.13/src/Makefile.in LPRng-3.6.13.new/src/Makefile.in
65 --- LPRng-3.6.13/src/Makefile.in Mon Feb 21 21:27:29 2000
66 +++ LPRng-3.6.13.new/src/Makefile.in Thu Mar 2 18:01:33 2000
74 -exec_prefix=@exec_prefix@
75 +exec_prefix = @exec_prefix@
79 # for admin type of binaries
83 -libexecdir=@libexecdir@
84 +libexecdir = @libexecdir@
85 # for the configuration stuff
86 -sysconfdir=@sysconfdir@
87 +sysconfdir = @sysconfdir@
89 localedir = $(prefix)/@DATADIRNAME@/locale
94 echo "SETUID_ROOT IS ${PERMS}, PERMS $(ROOT_PERMS)";
95 - for i in ${bindir} ${sbindir} ${LPD_DIR} ${FILTER_DIR}; do \
96 + for i in $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(LPD_DIR) $(DESTDIR)$(FILTER_DIR); do \
97 if [ ! -d $$i ] ; then ${SRC}/mkinstalldirs $$i ; fi; \
100 - ${INSTALLCMD} ${STRIP} -m $(ROOT_PERMS) lpq ${bindir}
101 - ${INSTALLCMD} ${STRIP} -m $(ROOT_PERMS) lprm ${bindir}
102 - ${INSTALLCMD} ${STRIP} -m $(ROOT_PERMS) lpr ${bindir}
103 - ${INSTALLCMD} ${STRIP} -m $(ROOT_PERMS) lpstat ${bindir}
104 - ${INSTALLCMD} ${STRIP} -m $(ROOT_PERMS) lpc ${sbindir}
105 - ${INSTALLCMD} ${STRIP} -m $(ROOT_PERMS) lpd ${LPD_DIR}
106 - ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpf ${FILTER_DIR}
107 - ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpbanner ${FILTER_DIR}
108 - ${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${FILTER_DIR}
109 - ${INSTALLCMD} -m $(NORM_PERMS) psbanner ${FILTER_DIR}
110 - ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) checkpc ${sbindir}
111 - ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpraccnt ${sbindir}
112 - cd ${bindir}; rm -f lp cancel; ln -s lpr lp; ln -s lprm cancel;
113 + ${INSTALLCMD} ${STRIP} -m $(ROOT_PERMS) lpq $(DESTDIR)$(bindir)
114 + ${INSTALLCMD} ${STRIP} -m $(ROOT_PERMS) lprm $(DESTDIR)$(bindir)
115 + ${INSTALLCMD} ${STRIP} -m $(ROOT_PERMS) lpr $(DESTDIR)$(bindir)
116 + ${INSTALLCMD} ${STRIP} -m $(ROOT_PERMS) lpstat $(DESTDIR)$(bindir)
117 + ${INSTALLCMD} ${STRIP} -m $(ROOT_PERMS) lpc $(DESTDIR)$(sbindir)
118 + ${INSTALLCMD} ${STRIP} -m $(ROOT_PERMS) lpd $(DESTDIR)$(LPD_DIR)
119 + ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpf $(DESTDIR)$(FILTER_DIR)
120 + ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpbanner $(DESTDIR)$(FILTER_DIR)
121 + ${INSTALLCMD} -m $(NORM_PERMS) pclbanner $(DESTDIR)$(FILTER_DIR)
122 + ${INSTALLCMD} -m $(NORM_PERMS) psbanner $(DESTDIR)$(FILTER_DIR)
123 + ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) checkpc $(DESTDIR)$(sbindir)
124 + ${INSTALLCMD} ${STRIP} -m $(NORM_PERMS) lpraccnt $(DESTDIR)$(sbindir)
125 + cd $(DESTDIR)$(bindir); rm -f lp cancel; ln -s lpr lp; ln -s lprm cancel;
128 - rm -f ${LPD_DIR}/lpd
129 - cd ${FILTER_DIR}; rm -f lpf lpbanner pclbanner psbanner
130 - cd ${bindir}; rm -f lp lpq lpstat lpr lp cancel;
131 - cd ${sbindir}; rm -f lpc checkpc lpraccnt;
132 + rm -f $(DESTDIR)$(LPD_DIR)/lpd
133 + cd $(DESTDIR)$(FILTER_DIR); rm -f lpf lpbanner pclbanner psbanner
134 + cd $(DESTDIR)$(bindir); rm -f lp lpq lpstat lpr lp cancel;
135 + cd $(DESTDIR)$(sbindir); rm -f lpc checkpc lpraccnt;
138 ###########################################################################