* load the url shortener links from a config file

[citadel.git] / citadel / Makefile.in

diff --git a/citadel/Makefile.in b/citadel/Makefile.in
index cb952e569a6a3f91a7fc104db1c11d6b99ee041c..f1c8736740f187eb74a9bfa50ee57f4a180a94c6 100644 (file)
--- a/citadel/Makefile.in
+++ b/citadel/Makefile.in
@@ -8,8 +8,6 @@
 # 2. Send e-mail to ajc@uncensored.citadel.org and let me know what you
 #    did, so any necessary changes can be put into the next release.
 #
-# $Id$
-#
 ########################################################################
 
 prefix=@prefix@
@@ -68,6 +66,7 @@ SERVER_LDFLAGS=@SERVER_LDFLAGS@
 SERVER_LIBS=@SERVER_LIBS@
 SETUP_LIBS=@SETUP_LIBS@
 YACC=@YACC@
+LOCALEDIR=@LOCALEDIR@
 
 # End configuration section
 
@@ -84,7 +83,7 @@ SOURCES=utils/aidepost.c utils/stress.c utils/whobbs.c utils/citmail.c \
        citserver.c clientsocket.c config.c control.c $(DATABASE) \
        domain.c serv_extensions.c file_ops.c genstamp.c getutline.c \
        housekeeping.c ical_dezonify.c internet_addressing.c ecrash.c \
-       locate_host.c md5.c auth.c msgbase.c parsedate.c policy.c \
+       locate_host.c md5.c auth.c msgbase.c parsedate.c \
        room_ops.c euidindex.c server_main.c snprintf.c ldap.c \
        support.c sysdep.c user_ops.c journaling.c threads.c \
        context.c
@@ -105,9 +104,10 @@ mkdir-init:
                (mkdir -p user_modules/$$d ) ; \
        done
        mkdir -p utils utillib textclient
+       mkdir locale
 
 svn_revision.c: ${SOURCES}
-       ./scripts/mk_svn_revision.sh
+       $(srcdir)/scripts/mk_svn_revision.sh
 
 DEP_FILES=$(SOURCES:.c=.d) modules_init.d modules_upgrade.d
 
@@ -150,7 +150,7 @@ modules_upgrade.c: modules_init.c
 SERV_OBJS = server_main.o utillib/citadel_dirs.o\
        user_ops.o citserver.o sysdep.o serv_extensions.o \
        $(DATABASE:.c=.o) domain.o \
-       control.o policy.o config.o support.o room_ops.o \
+       control.o config.o support.o room_ops.o \
        file_ops.o msgbase.o euidindex.o \
        locate_host.o housekeeping.o \
        internet_addressing.o journaling.o \
@@ -226,13 +226,23 @@ msgform$(EXEEXT): utils/msgform.o
 
 .PHONY: install-data install-doc install-exec clean cleaner distclean
 
-install: install-exec install-data install-doc
+install-locale:
+       cd po; $(MAKE)
+       for i in `find locale -type d | grep -v .svn` \
+               ; do \
+               test -d $(DESTDIR)$(LOCALEDIR)/$$i || mkdir -p $(DESTDIR)$(LOCALEDIR)/$$i; \
+       done
+       for i in `find locale -type f | grep -v .svn`; do \
+               $(INSTALL) $$i $(DESTDIR)$(LOCALEDIR)/$$i; \
+       done
+
+install: install-exec install-data install-doc install-locale
        @echo 
        @echo Installation is complete.
        @echo Now go to your Citadel directory and run 'setup'.
        @echo 
 
-install-new: install-exec-new install-data-new install-doc-new
+install-new: install-exec-new install-data-new install-doc-new install-locale
        @echo 
        @echo Installation is complete.
        @echo Now go to your Citadel directory and run 'setup'.
@@ -249,7 +259,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; \
@@ -265,6 +275,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$
 
@@ -383,6 +394,7 @@ install-exec-new: all
        done
 
 clean:
+       rm -fr locale/*
        rm -f *.o 
        rm -f utils/*.o ;\
        rm -f utillib/*.o ;\
@@ -404,6 +416,7 @@ cleaner: clean
 
 distclean: cleaner
        find . -name '*~' -o -name '.#*' | xargs rm -f
+       rm -f po/Makefile 
        rm -f Makefile sysdep.h config.cache config.log config.status *.d 
        rm -f utils/*.d ;
        rm -f utillib/*.d ;