* Merged Thierry's CSS changes

[citadel.git] / webcit / Makefile.in

diff --git a/webcit/Makefile.in b/webcit/Makefile.in
index 0512e25cea4a5facd8ca32c869e6251b1ac9739c..73afa4ef32159e5ef86a002dc3c0d66e2d10309b 100644 (file)
--- a/webcit/Makefile.in
+++ b/webcit/Makefile.in
@@ -14,20 +14,22 @@ PTHREAD_DEFS=@PTHREAD_DEFS@
 srcdir=@srcdir@
 prefix=@prefix@
 top_builddir=`pwd`
-
 LIB_SUBDIRS=
 PROG_SUBDIRS=@PROG_SUBDIRS@
 SUBDIRS=$(LIB_SUBDIRS) $(PROG_SUBDIRS) 
+LOCALEDIR=@LOCALEDIR@
+WWWDIR=@WWWDIR@
+EDITORDIR=@EDITORDIR@
 
 # End of configuration section
 
-all: all-progs-recursive webserver setup ctdlsvc
+all: all-progs-recursive webserver setup
 
 
 .SUFFIXES: .cpp .c .o
 
 clean:
-       rm -f *.o webcit webserver ctdlsvc
+       rm -f *.o webcit webserver
        rm -fr locale/*
 
 distclean: clean
@@ -39,9 +41,6 @@ setup: setup.o tools.o
        $(CC) setup.o tools.o \
        $(LIBOBJS) $(LIBS) $(LDFLAGS) $(SETUP_LIBS) -o setup
 
-ctdlsvc: ctdlsvc.o
-       $(CC) ctdlsvc.o -o ctdlsvc
-
 webserver: webserver.o context_loop.o tools.o ical_dezonify.o \
        cookie_conversion.o locate_host.o floors.o summary.o \
        webcit.o auth.o tcp_sockets.o mainmenu.o serv_func.o who.o \
@@ -68,40 +67,66 @@ webserver: webserver.o context_loop.o tools.o ical_dezonify.o \
        $(LIBOBJS) $(LIBS) $(LDFLAGS) -o webserver
 
 .c.o:
-       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(prefix)\" -DLOCALEDIR=\"$(prefix)/locale\" $<
+       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) \
+               -DWEBCITDIR=\"$(WWWDIR)\" \
+               -DLOCALEDIR=\"$(LOCALEDIR)\" \
+               -DEDITORDIR=\"$(EDITORDIR)\" $<
 
 .cpp.o:
-       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) -DWEBCITDIR=\"$(prefix)\" -DLOCALEDIR=\"$(prefix)/locale\"  $<
+       $(CC) $(CFLAGS) $(DEFS) -c $(PTHREAD_DEFS) \
+               -DWEBCITDIR=\"$(WWWDIR)\" \
+               -DLOCALEDIR=\"$(LOCALEDIR)\"  \
+               -DEDITORDIR=\"$(EDITORDIR)\"$<
 
 Makefile: $(srcdir)/Makefile.in config.status
-       CONFIG_FILES="Makefile" CONFIG_HEADERS= $(SHELL) ./config.status
+       CONFIG_FILES=Makefile CONFIG_HEADERS= $(SHELL) ./config.status
 
 config.status: $(srcdir)/configure
        $(SHELL) ./config.status --recheck
 
-$(srcdir)/configure: $(srcdir)/configure.in
+$(srcdir)/configure: $(srcdir)/configure.ac $(srcdir)/aclocal.m4
        cd $(srcdir) && $(AUTOCONF)
 
-install:
-       test -d $(root)$(prefix) || mkdir $(root)$(prefix)
-       test -d $(root)$(prefix)/static || mkdir $(root)$(prefix)/static
-       for i in `find tiny_mce -type d | grep -v .svn` \
-               ; do \
-               test -d $(root)$(prefix)/$$i || mkdir $(root)$(prefix)/$$i; \
+$(srcdir)/aclocal.m4: $(srcdir)/acinclude.m4
+       cd $(srcdir) && $(ACLOCAL)
+
+install:  install-bin install-setupbin install-locale install-wwwdata install-tinymce
+
+install-bin:
+       test -d $(DESTDIR)$(prefix) || mkdir -p $(DESTDIR)$(prefix)
+       $(INSTALL) webserver $(DESTDIR)$(prefix)/webserver
+
+
+install-setupbin: install-bin
+       $(INSTALL) setup $(DESTDIR)$(prefix)/setup
+
+
+install-wwwdata:
+       test -d $(DESTDIR)$(WWWDIR)/static.local || mkdir -p $(DESTDIR)$(WWWDIR)/static.local
+       test -d $(DESTDIR)$(WWWDIR)/static || mkdir -p $(DESTDIR)$(WWWDIR)/static
+       for i in `find static -type f | grep -v .svn`; do \
+               $(INSTALL) $$i $(DESTDIR)$(WWWDIR)/$$i; \
        done
-       for i in `find locale -type d | grep -v .svn` \
+
+install-tinymce:
+       test -d $(DESTDIR)$(WWWDIR)/static || mkdir -p $(DESTDIR)$(WWWDIR)/static
+       for i in `find tiny_mce -type d | grep -v .svn` \
                ; do \
-               test -d $(root)$(prefix)/$$i || mkdir $(root)$(prefix)/$$i; \
+               test -d $(DESTDIR)$(WWWDIR)/$$i || mkdir -p $(DESTDIR)$(WWWDIR)/$$i; \
        done
        for i in \
-               webserver \
-               setup \
-               ctdlsvc \
-               `find static -type f | grep -v .svn` \
                `find tiny_mce -type f | grep -v .svn` \
-               `find locale -type f | grep -v .svn` \
                ; do \
-               $(INSTALL) $$i $(root)$(prefix)/$$i; \
+               $(INSTALL) $$i $(DESTDIR)$(WWWDIR)/$$i; \
+       done
+
+install-locale:
+       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
 
 TAGS clean-recursive distclean-recursive depend-recursive check-recursive \