bernhard: doc/architecture Makefile,1.6,1.7

[cvs at intevation.de]

Author: bernhard

Update of /kolabrepository/doc/architecture
In directory doto:/tmp/cvs-serv16201

Modified Files:
	Makefile 
Log Message:
Improved rtf creation: the png suffix is seded into it now.
Renamed $DEST to HTML_DEST_DIR to avoid confusion, used it in the rest.
Fixed clean target (moved rtf removal to realclean).


Index: Makefile
===================================================================
RCS file: /kolabrepository/doc/architecture/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile	13 Apr 2004 13:42:42 -0000	1.6
+++ Makefile	21 Apr 2004 08:46:47 -0000	1.7
@@ -9,12 +9,12 @@
 # Known to run on Debian GNU/Linux with docbook-utils(0.6.13-2).
 
 NAME=		concept
-DEST=		concept
+HTML_DEST_DIR=	concept
 SHELL=		/bin/bash
-SGML_SRC=	concept.sgml 
+SGML_SRC=	$(NAME).sgml 
 INCLUDED_SRCS= overview.sgml client_server.sgml client_client.sgml server.sgml windows.sgml kde.sgml appendix.sgml erfrakon.eps
 
-HTML_DST=	concept/index.html
+HTML_DST=	$(HTML_DEST_DIR)/index.html
 PS_DST=		$(NAME).ps
 PDF_DST=	$(NAME).pdf
 RTF_DST=	$(NAME).rtf
@@ -27,7 +27,6 @@
 RTF_CMD=	db2rtf
 
 
-#$(DEST):	mkdir $(DEST)
 all: html ps pdf rtf clean
 
 html: $(HTML_DST)
@@ -37,8 +36,10 @@
 
 concept/index.html: $(SGML_SRC) $(INCLUDED_SRCS)
 	$(HTML_CMD) $(SGML_SRC)
-	cp erfrakon.png $(DEST)/
-	cat $(DEST)/index.html | sed -e 's/SRC=\"erfrakon\"/SRC=\"erfrakon\.png\"/g' > $(DEST)/index.html
+	cp erfrakon.png $(HTML_DEST_DIR)/
+	mv $(HTML_DEST_DIR)/index.html $(HTML_DEST_DIR)/index.html.tmp
+	cat $(HTML_DEST_DIR)/index.html.tmp | sed -e 's/SRC=\"erfrakon\"/SRC=\"erfrakon\.png\"/g' > $(HTML_DEST_DIR)/index.html
+	rm $(HTML_DEST_DIR)/index.html.tmp
 
 $(NAME).ps: $(SGML_SRC) $(INCLUDED_SRCS)
 	$(PS_CMD) $(SGML_SRC)
@@ -48,20 +49,19 @@
 
 $(NAME).rtf: $(SGML_SRC) $(INCLUDED_SRCS)
 	echo '**************'
-	echo currently this step might need adding a \".png\" to the erfrakon fileref
-	echo if you want the image to display
+	echo Keep in mind that "erfrakon.png" is referenced in the rtf file.
 	echo
 	$(RTF_CMD) $<
+	mv $(NAME).rtf $(NAME).rtf.tmp
+	cat $(NAME).rtf.tmp | sed -e 's/INCLUDEPICTURE \"erfrakon\"/INCLUDEPICTURE \"erfrakon.png\"/g' >$(NAME).rtf
+	rm $(NAME).rtf.tmp
+	
 
 clean:
-	rm -f *.tex *.dvi *.aux *.log
+	rm -f *.tex *.dvi *.aux *.log 
 	rm -rf db2html*
 	rm -rf $(NAME).junk
-	rm -f $(NAME).rtf 
 
 realclean: clean
-	rm -f $(NAME).ps $(NAME).pdf
-	rm -rf $(NAME)
-
-#archive: html ps pdf clean
-#	scp $(NAME)/*.html $(NAME)/*.gif $(NAME).ps $(NAME).pdf *.sgml root at main:/space/projectdoc/Topics/$(NAME)
+	rm -rf $(HTML_DEST_DIR)
+	rm -f $(PDF_DST) $(NAME).ps $(RTF_DST)