removal of CONFIG_DIR in favor of sysconfdir

diff --git a/etc/psf/Makefile.am b/etc/psf/Makefile.am
index 513a6b27012b27073cf0f355d7c8c3e16ce18a0c..9124fb0a3ef3ee0df63eb2faa16edba003b6aed5 100644 (file)
--- a/etc/psf/Makefile.am
+++ b/etc/psf/Makefile.am
@@ -10,7 +10,7 @@ CFLAGS = @CFLAGS@ -DZEROWIDTH \
        -D_PATH_PSORDER=\"$(bindir)/psorder\" \
        -D_PATH_PSA=\"$(sbindir)/psa\" \
        -D_PATH_PSFILTER=\"$(bindir)/etc2ps.sh\" \
-       -D_PATH_PAGECOUNT=\"$(CONFIG_DIR)/pagecount.ps\"
+       -D_PATH_PAGECOUNT=\"$(sysconfdir)/pagecount.ps\"
 
 EXTRA_DIST = etc2ps.sh
 

diff --git a/sys/solaris/Makefile b/sys/solaris/Makefile
index dca5ba70e5bf230cae11502b44df09800edae10e..4ed194ea50e111dc6104c3ad20d9323ade317c2a 100644 (file)
--- a/sys/solaris/Makefile
+++ b/sys/solaris/Makefile
@@ -73,8 +73,8 @@ kernel :      FRC
        fi; \
        echo "Making $@ for $$PROCESSOR..."; \
        ${MAKE} ${MFLAGS} \
-           SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}"\
-           ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+           SBINDIR="${sbindir}" BINDIR="${bindir}" RESDIR="${RESDIR}"\
+           ETCDIR="${sysconfdir}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
            MANDIR="${MANDIR}" DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" \
            KRBDIR="${KRBDIR}" OSDEFS="$${OSDEFS}" \
            MACHINEDEFS="$${MACHINEDEFS}" \
@@ -97,8 +97,8 @@ ${ALL}:       FRC
        cd $@; ${MAKE} ${MFLAGS} CC="${CC}" \
            ADDLIBS="${ADDLIBS}" DEFS="${DEFS} $${OSDEFS}" \
            OPTOPTS="${OPTOPTS}" \
-           SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
-           ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
+           SBINDIR="${sbindir}" BINDIR="${bindir}" RESDIR="${RESDIR}" \
+           ETCDIR="${sysconfdir}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
            DESTDIR="${DESTDIR}" AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
            AFPLIBS="${AFPLIBS}" LDSHARED="${LDSHARED}" \
            LDFLAGS_EXPORT="${LDFLAGS_EXPORT}" \
@@ -136,9 +136,9 @@ kinstall : kernel kuninstall
        if [ -f /etc/init.d/atalk ]; then \
                echo "Preserving existing /etc/init.d/atalk settings."; \
        else \
-       sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
-               -e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
-               -e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+       sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${sbindir}@ \
+               -e s@:BINDIR:@${bindir}@ -e s@:RESDIR:@${RESDIR}@ \
+               -e s@:ETCDIR:@${sysconfdir}@ -e s@:LIBDIR:@${LIBDIR}@ \
                -e s@:INCDIR:@${INCDIR}@ \
            < ../../distrib/initscripts/rc.atalk.sysv > /etc/init.d/atalk; \
        fi
@@ -147,14 +147,14 @@ kinstall : kernel kuninstall
        -ln -s ../init.d/atalk /etc/rc0.d/K79atalk
 
 install :
-       -mkdir ${DESTDIR}${sbindir} ${DESTDIR}${bindir} ${DESTDIR}${CONFIG_DIR} \
+       -mkdir ${DESTDIR}${sbindir} ${DESTDIR}${bindir} ${DESTDIR}${sysconfdir} \
                ${DESTDIR}${libdir}
        sed -e s@:BINDIR:@${prefix}/bin@ < ../../contrib/shell_utils/lp2pap.sh > ${DESTDIR}${RESDIR}/lp2pap.sh
-       chmod 744 ${DESTDIR}${CONFIG_DIR}/lp2pap.sh
+       chmod 744 ${DESTDIR}${sysconfdir}/lp2pap.sh
        for i in ${ALL}; \
            do (cd $$i; ${MAKE} ${MFLAGS} CC="${CC}" \
                ADDLIBS="${ADDLIBS}" DEFS="${DEFS}" OPTOPTS="${OPTOPTS}" \
-               SBINDIR="${SBINDIR}" BINDIR="${BINDIR}" RESDIR="${RESDIR}" \
+               SBINDIR="${sbindir}" BINDIR="${bindir}" RESDIR="${RESDIR}" \
                ETCDIR="${ETCDIR}" LIBDIR="${LIBDIR}" INCDIR="${INCDIR}" \
                AFSDIR="${AFSDIR}" KRBDIR="${KRBDIR}" \
                AFPLIBS="${AFPLIBS}" \
@@ -164,14 +164,14 @@ install :
                OSDEFS="$${OSDEFS}" MACHINEDEFS="$${MACHINEDEFS}" \
                INSTALL="${INSTALL}" $@); \
        done
-       if [ -f ${DESTDIR}${CONFIG_DIR}/afpd.conf ]; then \
+       if [ -f ${DESTDIR}${sysconfdir}/afpd.conf ]; then \
                echo "Retaining old afpd.conf file.";  \
        else \
-               sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${SBINDIR}@ \
-                       -e s@:BINDIR:@${BINDIR}@ -e s@:RESDIR:@${RESDIR}@ \
-                       -e s@:ETCDIR:@${ETCDIR}@ -e s@:LIBDIR:@${LIBDIR}@ \
+               sed -e s@:DESTDIR:@${DESTDIR}@ -e s@:SBINDIR:@${sbindir}@ \
+                       -e s@:BINDIR:@${bindir}@ -e s@:RESDIR:@${RESDIR}@ \
+                       -e s@:ETCDIR:@${sysconfdir}@ -e s@:LIBDIR:@${LIBDIR}@ \
                        -e s@:INCDIR:@${INCDIR}@ \
-                       < ../../config/afpd.conf > ${ETCDIR}/afpd.conf; \
+                       < ../../config/afpd.conf > ${sysconfdir}/afpd.conf; \
        fi
        @echo
        @echo "Install is done.  Don't forget to add lines from"