LPRng-autoconf.patch

   1 diff -Nru LPRng-3.6.2/configure.in LPRng-3.6.2.new/configure.in
   2 --- LPRng-3.6.2/configure.in    Sun Jun 13 02:14:48 1999
   3 +++ LPRng-3.6.2.new/configure.in        Sat Jul 10 16:19:24 1999
   4 @@ -1074,7 +1074,6 @@
   5
   6  dnl ----------------- Option for enabling GNU gettext --------------------
   7  AM_GNU_GETTEXT
   8 -test "$USE_NLS" = yes && LIBS="$LIBS -lintl"
   9
  10  dnl ----------------- GCC Compilation ----------------------------------
  11  AC_OUTPUT(Makefile
  12 diff -Nru LPRng-3.6.2/man/Makefile.in LPRng-3.6.2.new/man/Makefile.in
  13 --- LPRng-3.6.2/man/Makefile.in Sun Jun 13 02:15:52 1999
  14 +++ LPRng-3.6.2.new/man/Makefile.in     Sat Jul 10 16:23:23 1999
  15 @@ -22,7 +22,7 @@
  16
  17  ## fix up prefix to be a make variable
  18  prefix = @prefix@
  19 -MAN =          $(prefix)/man
  20 +mandir = @mandir@
  21  SHELL =                @SHELL@
  22
  23
  24 @@ -52,25 +52,25 @@
  25  # Standard man install target.
  26  #
  27  install:
  28 -       -${SRC}/mkinstalldirs $(MAN)/man1 $(MAN)/man5 $(MAN)/man8
  29 -       for i in ${SRC}/*.1; do $(MANINSTCMD) $$i $(MAN)/man1/`basename $$i`$(MANEXT); done
  30 -       for i in ${SRC}/*.5; do $(MANINSTCMD) $$i $(MAN)/man5/`basename $$i`$(MANEXT); done
  31 -       for i in ${SRC}/*.8; do $(MANINSTCMD) $$i $(MAN)/man8/`basename $$i`$(MANEXT); done
  32 +       -${SRC}/mkinstalldirs $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8
  33 +       for i in ${SRC}/*.1; do $(MANINSTCMD) $$i $(DESTDIR)$(mandir)/man1/`basename $$i`$(MANEXT); done
  34 +       for i in ${SRC}/*.5; do $(MANINSTCMD) $$i $(DESTDIR)$(mandir)/man5/`basename $$i`$(MANEXT); done
  35 +       for i in ${SRC}/*.8; do $(MANINSTCMD) $$i $(DESTDIR)$(mandir)/man8/`basename $$i`$(MANEXT); done
  36
  37  # Install man pages in compressed form.
  38  #
  39  install.zman:
  40         for i in ${SRC}/*.1; do compress < $$i >/tmp/_; \
  41 -                $(MANINSTCMD) /tmp/_ $(MAN)/man1.Z/$$i$(MANEXT); rm -f /tmp/_; done
  42 +                $(MANINSTCMD) /tmp/_ $(mandir)/man1.Z/$$i$(MANEXT); rm -f /tmp/_; done
  43         for i in ${SRC}/*.5; do compress < $$i >/tmp/_; \
  44 -                $(MANINSTCMD) /tmp/_ $(MAN)/man5.Z/$$i$(MANEXT); rm -f /tmp/_; done
  45 +                $(MANINSTCMD) /tmp/_ $(mandir)/man5.Z/$$i$(MANEXT); rm -f /tmp/_; done
  46         for i in ${SRC}/*.8; do compress < $$i >/tmp/_; \
  47 -                $(MANINSTCMD) /tmp/_ $(MAN)/man8.Z/$$i$(MANEXT); rm -f /tmp/_; done
  48 +                $(MANINSTCMD) /tmp/_ $(mandir)/man8.Z/$$i$(MANEXT); rm -f /tmp/_; done
  49
  50  uninstall:
  51 -       for i in *.1; do rm -f $(MAN)/man1/$$i$(MANEXT); done
  52 -       for i in *.5; do rm -f $(MAN)/man5/$$i$(MANEXT); done
  53 -       for i in *.8; do rm -f $(MAN)/man8/$$i$(MANEXT); done
  54 +       for i in *.1; do rm -f $(mandir)/man1/$$i$(MANEXT); done
  55 +       for i in *.5; do rm -f $(mandir)/man5/$$i$(MANEXT); done
  56 +       for i in *.8; do rm -f $(mandir)/man8/$$i$(MANEXT); done
  57
  58  realclean mostlyclean distclean:: clean
  59         rm -f Makefile
  60 diff -Nru LPRng-3.6.2/src/Makefile.in LPRng-3.6.2.new/src/Makefile.in
  61 --- LPRng-3.6.2/src/Makefile.in Sun Jun 13 02:14:52 1999
  62 +++ LPRng-3.6.2.new/src/Makefile.in     Sat Jul 10 16:49:51 1999
  63 @@ -60,20 +60,15 @@
  64  LDCC=@LDCC@
  65
  66  # where executables are installed
  67 -prefix=@prefix@
  68 -exec_prefix=@exec_prefix@
  69 -bindir     = @bindir@
  70 -sbindir    = @sbindir@
  71 -libexecdir = @libexecdir@
  72 -libdir     = @libdir@
  73 -localedir = $(prefix)/@DATADIRNAME@/locale
  74 -INSTALL_BIN =     @bindir@
  75 -# where daemons are installed: lpd
  76 -#INSTALL_LIB =     ${prefix}/lib
  77 -INSTALL_LIB =     @LPRNGLPDDIR@
  78 -# where maintenance commands are installed: checkpc, setstatus
  79 -#INSTALL_MAINT =   ${exec_prefix}/bin
  80 -INSTALL_MAINT =   @LPRNGADMINDIR@
  81 +prefix         = @prefix@
  82 +exec_prefix    = @exec_prefix@
  83 +bindir         = @bindir@
  84 +sbindir                = @sbindir@
  85 +libexecdir     = @libexecdir@
  86 +libdir         = @libdir@
  87 +localedir      = $(prefix)/@DATADIRNAME@/locale
  88 +bindir         = @bindir@
  89 +sbindir                = @sbindir@
  90
  91  CF := @CPPFLAGS@ @CFLAGS@ @DEFS@ -DLOCALEDIR=\"$(localedir)\"
  92  LF := @LDFLAGS@
  93 @@ -329,21 +324,24 @@
  94  PERMS=$(SUID_ROOT_PERMS)
  95  ###########################################################################
  96
  97 -install: all ${INSTALL_LIB} ${INSTALL_BIN} ${INSTALL_MAINT}
  98 -       ${INSTALLCMD} -m $(PERMS) lpq ${INSTALL_BIN}
  99 -       ${INSTALLCMD} -m $(PERMS) lprm ${INSTALL_BIN}
 100 -       ${INSTALLCMD} -m $(PERMS) lpr ${INSTALL_BIN}
 101 -       ${INSTALLCMD} -m $(PERMS) lpstat ${INSTALL_BIN}
 102 -       ${INSTALLCMD} -m $(PERMS) lpc ${INSTALL_MAINT}
 103 -       ${INSTALLCMD} -m $(NORM_PERMS) lpd ${INSTALL_LIB}
 104 -       ${INSTALLCMD} -m $(NORM_PERMS) lpf ${INSTALL_LIB}
 105 -       ${INSTALLCMD} -m $(NORM_PERMS) lpbanner ${INSTALL_LIB}
 106 -       ${INSTALLCMD} -m $(NORM_PERMS) pclbanner ${INSTALL_LIB}
 107 -       ${INSTALLCMD} -m $(NORM_PERMS) psbanner ${INSTALL_LIB}
 108 -       ${INSTALLCMD} -m $(NORM_PERMS) checkpc ${INSTALL_MAINT}
 109 -       ${INSTALLCMD} -m $(NORM_PERMS) lpraccnt ${INSTALL_MAINT}
 110 -       rm -f ${INSTALL_BIN}/lp;     ln -s lpr  ${INSTALL_BIN}/lp;
 111 -       rm -f ${INSTALL_BIN}/cancel; ln -s lprm ${INSTALL_BIN}/cancel;
 112 +installdirs:
 113 +       ${SRC}/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir)
 114 +
 115 +install: all installdirs
 116 +       ${INSTALLCMD} -m $(PERMS) lpq $(DESTDIR)$(bindir)
 117 +       ${INSTALLCMD} -m $(PERMS) lprm $(DESTDIR)$(bindir)
 118 +       ${INSTALLCMD} -m $(PERMS) lpr $(DESTDIR)$(bindir)
 119 +       ${INSTALLCMD} -m $(PERMS) lpstat $(DESTDIR)$(bindir)
 120 +       ${INSTALLCMD} -m $(PERMS) lpc $(DESTDIR)$(sbindir)
 121 +       ${INSTALLCMD} -m $(NORM_PERMS) lpd $(DESTDIR)$(sbindir)
 122 +       ${INSTALLCMD} -m $(NORM_PERMS) lpf $(DESTDIR)$(sbindir)
 123 +       ${INSTALLCMD} -m $(NORM_PERMS) lpbanner $(DESTDIR)$(sbindir)
 124 +       ${INSTALLCMD} -m $(NORM_PERMS) pclbanner $(DESTDIR)$(sbindir)
 125 +       ${INSTALLCMD} -m $(NORM_PERMS) psbanner $(DESTDIR)$(sbindir)
 126 +       ${INSTALLCMD} -m $(NORM_PERMS) checkpc $(DESTDIR)$(sbindir)
 127 +       ${INSTALLCMD} -m $(NORM_PERMS) lpraccnt $(DESTDIR)$(sbindir)
 128 +       rm -f $(bindir)/lp;     ln -s lpr  $(DESTDIR)$(bindir)/lp;
 129 +       rm -f $(bindir)/cancel; ln -s lprm $(DESTDIR)$(bindir)/cancel;
 130         f=/etc/lpd.conf; \
 131         if [ -n "$(LPD_CONF_PATH)" ] ; then f=$(LPD_CONF_PATH); fi; \
 132         if [ ! -f "$$f" ] ; then \
 133 @@ -352,23 +350,15 @@
 134                 ${INSTALLCMD} -m $(NORM_PERMS) lpd.conf $$f.sample ; \
 135         fi;
 136
 137 -${INSTALL_LIB}::
 138 -       ${SRC}/mkinstalldirs $@
 139 -${INSTALL_BIN}::
 140 -       ${SRC}/mkinstalldirs $@
 141 -${INSTALL_MAINT}::
 142 -       ${SRC}/mkinstalldirs $@
 143 -
 144 -
 145  uninstall:
 146 -       rm -f ${INSTALL_LIB}/lpd
 147 -       rm -f ${INSTALL_LIB}/lpf
 148 -       rm -f ${INSTALL_BIN}/lpq
 149 -       rm -f ${INSTALL_BIN}/lpstat
 150 -       rm -f ${INSTALL_BIN}/lprm
 151 -       rm -f ${INSTALL_BIN}/lpr
 152 -       rm -f ${INSTALL_MAINT}/lpc
 153 -       rm -f ${INSTALL_MAINT}/checkpc
 154 +       rm -f $(libdir)/lpd
 155 +       rm -f $(libdir)/lpf
 156 +       rm -f $(bindir)/lpq
 157 +       rm -f $(bindir)/lpstat
 158 +       rm -f $(bindir)/lprm
 159 +       rm -f $(bindir)/lpr
 160 +       rm -f $(sbindir)/lpc
 161 +       rm -f $(sbindir)/checkpc
 162
 163
 164  ###########################################################################