From: Wilfried Göesgens <willi@citadel.org>
Date: Wed, 22 Mar 2006 23:44:44 +0000 (+0000)
Subject: * added central location for tiny_mce
X-Git-Tag: v7.86~4095
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=142845b3e1e6550e350957b9d24656991eeed942

* added central location for tiny_mce
* added directory calculation routines
* added Documentation for packaging staff.
---

diff --git a/webcit/Makefile.am b/webcit/Makefile.am
index 8f3d13ad5..61fc5f146 100644
--- a/webcit/Makefile.am
+++ b/webcit/Makefile.am
@@ -12,6 +12,7 @@ DISTFILES=ABOUT_NLS
 
 DIRS= static
 EDITOR_DIRS=tiny_mce
+EDITORDIR=@editordir@
 
 
 
@@ -31,14 +32,14 @@ install-data-local:
 			done \
 		done
 
-		export STATIC_DIR=@editor@; \
+		export EDITOR_DIR=@editordir@; \
 		for dir in $(EDITOR_DIRS); do \
-			$(mkinstalldirs) $(DESTDIR)/$$STATIC_DIR/$$dir; \
+			$(mkinstalldirs) $(DESTDIR)/$$EDITOR_DIR/$$dir; \
 			for subdir in `find $$dir -type d |grep -v .svn`; do \
-				$(mkinstalldirs) $(DESTDIR)/$$STATIC_DIR/$$subdir; \
+				$(mkinstalldirs) $(DESTDIR)/$$EDITOR_DIR/$$subdir; \
 					for file in $(srcdir)/$$subdir/*; do \
 						if test -f "$$file" ; then \
-							$(INSTALL_DATA) $$file $(DESTDIR)$$STATIC_DIR/$$subdir; \
+							$(INSTALL_DATA) $$file $(DESTDIR)$$EDITOR_DIR/$$subdir; \
 						fi \
 					done \
 			done \
diff --git a/webcit/README b/webcit/README
index 11f3b6350..55b2d4a0a 100644
--- a/webcit/README
+++ b/webcit/README
@@ -280,8 +280,7 @@ and enable the user to copy them over to another dir (like /var/lib/citadel/www)
 they're accessed at runtime. (The debian instatll scripts provided with this package 
 do this to preserve user changes to the template system, see debian/citadel-webcit.postinstall)
 
-[todo]
 Further there are possibilities to load the tiny_mce editor into a system uniq location. Webcit 
 uses this standard component compose its messages for mails and postings. Several webcit installations
 that may differ in design but use the same tiny_mce (which is the default that webcit ships with)
-
+(set --with-editordir for that, it defaults to the dir the templates go)
diff --git a/webcit/configure.in b/webcit/configure.in
index b937a0c91..d555e1534 100644
--- a/webcit/configure.in
+++ b/webcit/configure.in
@@ -406,11 +406,11 @@ AC_ARG_WITH(staticrundir, [  --with-staticrundir=DIR          where to search da
 AC_DEFINE_UNQUOTED([DATADIR],["$staticrundir"],where should we make our root?)
 
 
-AC_ARG_WITH(editor, [  --with-editor=DIR          where to search the editor at runtime],
+AC_ARG_WITH(editordir, [  --with-editordir=DIR          where to search the editor at runtime],
 						  [ editordir=$withval ],[ editordir=$staticrundir ] )
+AC_SUBST(editordir)
 AC_DEFINE_UNQUOTED([EDITORDIR],["$editordir"],where find the editor (tiny_mce)?)
 
-AC_SUBST(editor)
 
 
 AC_OUTPUT(Makefile src/Makefile po/Makefile.in   )
diff --git a/webcit/debian/citadel-webcit.postrm b/webcit/debian/citadel-webcit.postrm
index 63e9d9fc7..3eb321bff 100644
--- a/webcit/debian/citadel-webcit.postrm
+++ b/webcit/debian/citadel-webcit.postrm
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/sh 
 # postrm.skeleton
 # Skeleton maintainer script showing all the possible cases.
 # Written by Charles Briscoe-Smith, March-June 1998.  Public Domain.
@@ -45,10 +45,11 @@ case "$1" in
 	fi
 	#rmdir /var/lib/citadel/www/static
 	echo "/var/lib/citadel/www/keys not removed. "
-	db_purge 'citadel/WebcitHttpsPort'
-	db_purge 'citadel/WebcitHttpPort'
-	db_purge 'citade/WebcitInstallnote'
-	### TODO: remove citadel from inittab!
+	db_purge
+### 'citadel/WebcitHttpsPort'
+###	db_purge 'citadel/WebcitHttpPort'
+###	db_purge 'citade/WebcitInstallnote'
+###	### TODO: remove citadel from inittab!
     ;;
   disappear)
     if test "$2" != overwriter; then
diff --git a/webcit/debian/rules b/webcit/debian/rules
index 2975a9d83..10d6d8fb7 100755
--- a/webcit/debian/rules
+++ b/webcit/debian/rules
@@ -30,12 +30,12 @@ configure-stamp:
 		--prefix=/usr \
 		--with-staticdir=/usr/share/doc/citadel-webcit/examples \
 		--with-staticrundir=/var/lib/citadel/www/ \
-		--with-editor=/usr/share/tiny_mce/ \
+		--with-editordir=/usr/share/ \
 		--with-rundir=/var/run/citadel \
 		--with-ical --with-db --with-ldap --with-zlib --with-ssl --with-libiconf --with-newt --with-included-gettext
 
 	touch configure-stamp
-
+#we don't do /usr/share/tiny_mce, because of make brings one with it.
 
 build: build-stamp