diff --git a/Makefile b/Makefile index a91a468..295b2e6 100644 --- a/Makefile +++ b/Makefile @@ -100,6 +100,9 @@ cd-template: verzeichnisstruktur doku: cd-template @echo "Aktualisiere das Doku-Verzeichnis ..." + # aufgrund einer Seltsamkeit im doku-Makefile, muss es zweimal aufgerufen werden, + # wenn der online- zum offline-Status geaendert wird (und umgekehrt) + @make -C documents $(LINE_STATUS) install @make -C documents $(LINE_STATUS) install setze_releaseinfos: cd-template diff --git a/documents/Makefile b/documents/Makefile index 35422ce..7d32bdc 100644 --- a/documents/Makefile +++ b/documents/Makefile @@ -23,8 +23,7 @@ LATEX2HTMLPREFIX := -no_auto_link -split 0 -no_navigation -no_subdir -dir _outpu .PHONY : clean online offline clean-targets install all # default target (offline) -all: $(HTML_FILES) - +all: $(TARGET_FILES) # copy the created files to the destination directory (usually outside of this directory tree) install: $(TARGET_FILES) @@ -45,16 +44,24 @@ clean-targets: online: LINE_STATUS=online offline: LINE_STATUS=offline -online offline: clean-targets $(TARGET_FILES) + +# pruefen, ob die Menue-Datei durch eine neuere ersetzt werden muss - ansonsten: ignorieren +menue.lyx online offline: menue_$(LINE_STATUS).lyx + @if diff -qN menue.lyx menue_$(LINE_STATUS).lyx >/dev/null ;\ + then true ;\ + else cp menue_$(LINE_STATUS).lyx menue.lyx ;\ + fi + +online offline: $(TARGET_FILES) # add headers, navigation and footers $(TARGET_FILES): $(HTML_FILES) $(ASC_FILES) - cat nav.$(LINE_STATUS).asc $(notdir $(basename $@))/$(notdir $@) footer.asc >$@ - + cat $(notdir $(basename $@))/$(notdir $@) footer.asc >$@ + # create tex files from lyx -$(TEX_FILES): %.tex: %.lyx +$(TEX_FILES): menue.lyx $(LYX_FILES) lyx -e latex $*.lyx @@ -76,4 +83,5 @@ clean: -rm -r _output 2>/dev/null -rm $(foreach dir,$(DOCUMENT_NAMES),$(dir)/WARNINGS) 2>/dev/null -rm $(foreach dir,$(DOCUMENT_NAMES),$(dir)/$(dir).emergency) 2>/dev/null + -rm menue.lyx menue.tex diff --git a/documents/asymmetrie/asymmetrie.lyx b/documents/asymmetrie/asymmetrie.lyx index 9560fcf..e3f4ad9 100644 --- a/documents/asymmetrie/asymmetrie.lyx +++ b/documents/asymmetrie/asymmetrie.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{/home/phil/daten/sao/svn/cryptocd/trunk/documents/menue.lyx} +\begin_inset Include \input{../menue.lyx} preview false \end_inset diff --git a/documents/chaosradio/chaosradio.lyx b/documents/chaosradio/chaosradio.lyx index 3eeeee9..3391c63 100644 --- a/documents/chaosradio/chaosradio.lyx +++ b/documents/chaosradio/chaosradio.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{/home/phil/daten/sao/svn/cryptocd/trunk/documents/menue.lyx} +\begin_inset Include \input{../menue.lyx} preview false \end_inset diff --git a/documents/copyleft/copyleft.lyx b/documents/copyleft/copyleft.lyx index 9b5be7b..e5ee59d 100644 --- a/documents/copyleft/copyleft.lyx +++ b/documents/copyleft/copyleft.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{/home/phil/daten/sao/svn/cryptocd/trunk/documents/menue.lyx} +\begin_inset Include \input{../menue.lyx} preview false \end_inset diff --git a/documents/intro/intro.lyx b/documents/intro/intro.lyx index 0ef91b4..79a67e3 100644 --- a/documents/intro/intro.lyx +++ b/documents/intro/intro.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{/home/phil/daten/sao/svn/cryptocd/trunk/documents/menue.lyx} +\begin_inset Include \input{../menue.lyx} preview false \end_inset diff --git a/documents/mailserviceanbieter/mailserviceanbieter.lyx b/documents/mailserviceanbieter/mailserviceanbieter.lyx index cc80d7c..b8e0c9e 100644 --- a/documents/mailserviceanbieter/mailserviceanbieter.lyx +++ b/documents/mailserviceanbieter/mailserviceanbieter.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{/home/phil/daten/sao/svn/cryptocd/trunk/documents/menue.lyx} +\begin_inset Include \input{../menue.lyx} preview false \end_inset diff --git a/documents/menue.lyx b/documents/menue.lyx deleted file mode 100644 index ba27b1a..0000000 --- a/documents/menue.lyx +++ /dev/null @@ -1,34 +0,0 @@ -#LyX 1.3 created this file. For more info see http://www.lyx.org/ -\lyxformat 221 -\textclass article -\begin_preamble -\usepackage{hyperref} -\usepackage{html} -\usepackage{german} -\end_preamble -\language ngerman -\inputencoding auto -\fontscheme default -\graphics default -\paperfontsize default -\spacing single -\papersize Default -\paperpackage a4 -\use_geometry 0 -\use_amsmath 0 -\use_natbib 0 -\use_numerical_citations 0 -\paperorientation portrait -\secnumdepth 3 -\tocdepth 3 -\paragraph_separation indent -\defskip medskip -\quotes_language english -\quotes_times 2 -\papercolumns 1 -\papersides 1 -\paperpagestyle default - -\layout Standard - -\the_end diff --git a/documents/mozilla/mozilla.lyx b/documents/mozilla/mozilla.lyx index 2e0c7d6..989a5ed 100644 --- a/documents/mozilla/mozilla.lyx +++ b/documents/mozilla/mozilla.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{/home/phil/daten/sao/svn/cryptocd/trunk/documents/menue.lyx} +\begin_inset Include \input{../menue.lyx} preview false \end_inset diff --git a/documents/outlook/outlook.lyx b/documents/outlook/outlook.lyx index 4d19ac9..d63518e 100644 --- a/documents/outlook/outlook.lyx +++ b/documents/outlook/outlook.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{/home/phil/daten/sao/svn/cryptocd/trunk/documents/menue.lyx} +\begin_inset Include \input{../menue.lyx} preview false \end_inset diff --git a/documents/pgp_vs_gnupg/pgp_vs_gnupg.lyx b/documents/pgp_vs_gnupg/pgp_vs_gnupg.lyx index 86541a1..b67e93b 100644 --- a/documents/pgp_vs_gnupg/pgp_vs_gnupg.lyx +++ b/documents/pgp_vs_gnupg/pgp_vs_gnupg.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{/home/phil/daten/sao/svn/cryptocd/trunk/documents/menue.lyx} +\begin_inset Include \input{../menue.lyx} preview false \end_inset diff --git a/documents/senselab/senselab.lyx b/documents/senselab/senselab.lyx index b994fab..57eae59 100644 --- a/documents/senselab/senselab.lyx +++ b/documents/senselab/senselab.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{/home/phil/daten/sao/svn/cryptocd/trunk/documents/menue.lyx} +\begin_inset Include \input{../menue.lyx} preview false \end_inset diff --git a/documents/thunderbird/thunderbird.lyx b/documents/thunderbird/thunderbird.lyx index e0a187c..7543f3e 100644 --- a/documents/thunderbird/thunderbird.lyx +++ b/documents/thunderbird/thunderbird.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{/home/phil/daten/sao/svn/cryptocd/trunk/documents/menue.lyx} +\begin_inset Include \input{../menue.lyx} preview false \end_inset diff --git a/documents/thunderbirdnutzung/thunderbirdnutzung.lyx b/documents/thunderbirdnutzung/thunderbirdnutzung.lyx index 744e8bc..412a425 100644 --- a/documents/thunderbirdnutzung/thunderbirdnutzung.lyx +++ b/documents/thunderbirdnutzung/thunderbirdnutzung.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{/home/phil/daten/sao/svn/cryptocd/trunk/documents/menue.lyx} +\begin_inset Include \input{../menue.lyx} preview false \end_inset diff --git a/documents/warumverschluesselung/warumverschluesselung.lyx b/documents/warumverschluesselung/warumverschluesselung.lyx index 862f401..ee3a2d3 100644 --- a/documents/warumverschluesselung/warumverschluesselung.lyx +++ b/documents/warumverschluesselung/warumverschluesselung.lyx @@ -93,7 +93,7 @@ rundum sicher \layout Standard -\begin_inset Include \input{/home/phil/daten/sao/svn/cryptocd/trunk/documents/menue.lyx} +\begin_inset Include \input{../menue.lyx} preview false \end_inset diff --git a/documents/wiefunktionierts/wiefunktionierts.lyx b/documents/wiefunktionierts/wiefunktionierts.lyx index 82c4072..857ed91 100644 --- a/documents/wiefunktionierts/wiefunktionierts.lyx +++ b/documents/wiefunktionierts/wiefunktionierts.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{/home/phil/daten/sao/svn/cryptocd/trunk/documents/menue.lyx} +\begin_inset Include \input{../menue.lyx} preview false \end_inset diff --git a/documents/winpt/winpt.lyx b/documents/winpt/winpt.lyx index a9e07aa..fddd28f 100644 --- a/documents/winpt/winpt.lyx +++ b/documents/winpt/winpt.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{/home/phil/daten/sao/svn/cryptocd/trunk/documents/menue.lyx} +\begin_inset Include \input{../menue.lyx} preview false \end_inset