Sam Noble's ADMIN_GRP patch, removed Marc's old ADMIN_GRP patch.

[netatalk.git] / etc / afpd / Makefile

diff --git a/etc/afpd/Makefile b/etc/afpd/Makefile
index 3bff97eb694f2f29359cfd9f8903a456fcd91f68..dfad3650773148da58c32cf4d266baa4a156e2a0 100644 (file)
--- a/etc/afpd/Makefile
+++ b/etc/afpd/Makefile
@@ -3,16 +3,17 @@
 
 SRC = unix.c ofork.c main.c switch.c auth.c volume.c directory.c file.c \
        enumerate.c desktop.c filedir.c fork.c appl.c gettok.c \
-       status.c afp_options.c afp_asp.c afp_dsi.c messages.c config.c \
+       status.c afp_options.c afp_asp.c afp_dsi.c messages.c afp_config.c \
        nfsquota.c codepage.c quota.c uam.c afs.c
 
 OBJ = unix.o ofork.o main.o switch.o auth.o volume.o directory.o file.o \
        enumerate.o desktop.o filedir.o fork.o appl.o gettok.o \
-       status.o afp_options.o afp_asp.o afp_dsi.o messages.o config.o \
+       status.o afp_options.o afp_asp.o afp_dsi.o messages.o afp_config.o \
        nfsquota.o codepage.o quota.o uam.o afs.o
 
 INCPATH=       -I../../include ${AFSINCPATH}
-CFLAGS=        ${DEFS} ${AFSDEFS} ${OPTOPTS} ${INCPATH} -DAPPLCNAME
+CFLAGS=        ${DEFS} ${AFSDEFS} ${CAPDEFS} ${OPTOPTS} ${INCPATH} -DAPPLCNAME \
+        -DSERVERTEXT=\"${MSGDIR}\" -DDROPKLUDGE -DADMIN_GRP 
 LIBS = -latalk ${AFSLIBS} ${ADDLIBS} ${TCPWRAPLIBS} ${DB2LIBS} \
        ${RPCSVCLIB} ${AFPLIBS} ${PAMLIBS} ${LIBSHARED} 
 LIBDIRS=       -L../../libatalk ${AFSLIBDIRS} ${TCPWRAPLIBDIRS} \
@@ -45,6 +46,9 @@ all : ${SUBDIRS}
            fi; \
            PAMDEFS="-DUSE_PAM"; \
        fi; \
+       if [ x"${CAPDIR}" != x ]; then \
+           CAPDEFS="-DCAPDIR='\"${CAPDIR}\"'";\
+       fi; \
        if [ -f /usr/lib/librpcsvc.a -o -f /lib/librpcsvc.a ]; then \
            RPCSVCLIB=-lrpcsvc; \
        fi; \
@@ -59,7 +63,7 @@ all : ${SUBDIRS}
            LIBSHARED="$${LIBSHARED}" PAMLIBS="$${PAMLIBS}" \
            PAMLIBDIR="$${PAMLIBDIR}" RPCSVCLIB="$${RPCSVCLIB}" \
            AFSINCPATH="$${AFSINCPATH}" AFSDEFS="$${AFSDEFS}" \
-           DB2INCPATH="$${DB2INCPATH}" \
+           CAPDEFS="$${CAPDEFS}" DB2INCPATH="$${DB2INCPATH}" \
            afpd
 
 ${SUBDIRS}: FRC
@@ -86,7 +90,7 @@ afp_options.o : afp_options.c
            -D_PATH_AFPDNLSPATH=\"${RESDIR}/nls/\" \
            ${CPPFLAGS} -c $<
 
-config.o: config.c
+afp_config.o: afp_config.c
        ${CC} ${CFLAGS} \
            -DVERSION=\"`cat ../../VERSION`\" \
            ${CPPFLAGS} -c $<