Use autoconf to locate the diff and patch executables and pass those pathnames to...

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index 304596f70b27bd9a97d8756308c897ffe3cf38de..44de522c3f9c3947a2c70543c2a5bbcae2335735 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -47,14 +47,13 @@ UTILBIN_TARGETS= base64$(EXEEXT) setup$(EXEEXT) \
 
 
 ACLOCAL=@ACLOCAL@
-AUTH=@AUTH@
 AUTOCONF=@AUTOCONF@
 chkpwd_LIBS=@chkpwd_LIBS@
 CC=@CC@
 CFLAGS=@CFLAGS@ -I ./include/
 CPPFLAGS=@CPPFLAGS@ -I. -I ./include/
 DATABASE=@DATABASE@
-DEFS=@DEFS@
+DEFS=@DEFS@ -DDIFF=\"@DIFF@\" -DPATCH=\"@PATCH@\"
 LDFLAGS=@LDFLAGS@
 LIBS=@LIBS@
 LIBOBJS=@LIBOBJS@
@@ -66,10 +65,14 @@ SERVER_LDFLAGS=@SERVER_LDFLAGS@
 SERVER_LIBS=@SERVER_LIBS@
 SETUP_LIBS=@SETUP_LIBS@
 YACC=@YACC@
+DIFF=@DIFF@
+PATCH=@PATCH@
 LOCALEDIR=@LOCALEDIR@
 
 # End configuration section
 
+.SILENT:
+
 
 SOURCES=utils/aidepost.c utils/stress.c utils/whobbs.c utils/citmail.c \
        utils/setup.c utils/msgform.c utils/chkpw.c \
@@ -155,13 +158,14 @@ SERV_OBJS = server_main.o utillib/citadel_dirs.o\
        locate_host.o housekeeping.o \
        internet_addressing.o journaling.o \
        parsedate.o genstamp.o ecrash.o threads.o context.o \
-       clientsocket.o modules_init.o modules_upgrade.o $(AUTH) $(SERV_MODULES) \
+       clientsocket.o modules_init.o modules_upgrade.o $(SERV_MODULES) \
        svn_revision.o ldap.o
 
 citserver$(EXEEXT): $(SERV_OBJS)
        $(CC) $(SERV_OBJS) $(LDFLAGS) $(SERVER_LDFLAGS) $(LIBS) $(SERVER_LIBS) $(RESOLV) -o citserver$(EXEEXT)
 
-.c.o:
+%.o: %.c ${HEADERS}
+       echo "CC $<"
        $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) -c $< -o $@
 
 aidepost$(EXEEXT): utils/aidepost.o config.o
@@ -227,7 +231,7 @@ msgform$(EXEEXT): utils/msgform.o
 .PHONY: install-data install-doc install-exec clean cleaner distclean
 
 install-locale:
-       cd po; $(MAKE)
+       cd po/citadel-setup; $(MAKE)
        for i in `find locale -type d | grep -v .svn` \
                ; do \
                test -d $(DESTDIR)$(LOCALEDIR)/$$i || mkdir -p $(DESTDIR)$(LOCALEDIR)/$$i; \
@@ -259,7 +263,7 @@ install-data:
                 network/systems; do \
                $(srcdir)/mkinstalldirs $(DESTDIR)$(prefix)/$$i; \
        done
-       @for i in funambol_newmail_soap.xml notify_about_newmail.js citadel.rc public_clients \
+       @for i in funambol_newmail_soap.xml notify_about_newmail.js citadel.rc public_clients citadel_urlshorteners.rc \
                 `find $(srcdir)/help $(srcdir)/messages $(srcdir)/network -type f | grep -v .svn`; do \
                echo $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \
                $(INSTALL_DATA) $$i $(DESTDIR)$(prefix)/$$i; \
@@ -275,6 +279,7 @@ install-data-new:
        done
        $(srcdir)/mkinstalldirs $(DESTDIR)$(ETC_DIR)/
        $(INSTALL_DATA) $(srcdir)/public_clients $(DESTDIR)$(ETC_DIR)/public_clients
+       $(INSTALL_DATA) $(srcdir)/citadel_urlshorteners.rc $(DESTDIR)$(ETC_DIR)/citadel_urlshorteners.rc
        $(INSTALL_DATA) $(srcdir)/citadel.rc $(DESTDIR)$(ETC_DIR)/citadel.rc
        $(INSTALL_DATA) $(srcdir)/network/mail.aliases $(DESTDIR)$(ETC_DIR)/mail.aliases$