diff --git a/Makefile b/Makefile index 295b2e6..856828b 100644 --- a/Makefile +++ b/Makefile @@ -102,12 +102,13 @@ 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 + @make -C documents $(LINE_STATUS) + @make -C documents install setze_releaseinfos: cd-template - @echo "Passe version.txt an ..." - sed -i 's/REVISIONS_PLATZHALTER/$(ARBEITS_REVISION)/g; s/DATUMS_PLATZHALTER/$(REVISIONS_DATUM)/g' $(CCD_BUILD_DIR)/version.txt + # ein nutzloses Relikt, oder nur der falsche Dateiname? + # @echo "Passe version.txt an ..." + # sed -i 's/REVISIONS_PLATZHALTER/$(ARBEITS_REVISION)/g; s/DATUMS_PLATZHALTER/$(REVISIONS_DATUM)/g' $(CCD_BUILD_DIR)/version.txt hole_quell_daten: @if [ ! -e "$(MIRROR_QUELLE_DIR)" ] ;\ @@ -152,7 +153,7 @@ release: EXPORT_FILE_SUFFIX := _small release_all: EXPORT_FILE_SUFFIX := _all release_all: verlinke_chaosradio verlinke_programme -release release_all: verlinke_programme setze_releaseinfos +release release_all: doku verlinke_programme setze_releaseinfos @echo "Erzeuge zip-Archiv ..." @$(ERZEUGE_ZIP) @echo "Erzeuge iso-Image ..." diff --git a/documents/Makefile b/documents/Makefile index 7d32bdc..3e51805 100644 --- a/documents/Makefile +++ b/documents/Makefile @@ -46,10 +46,10 @@ online: LINE_STATUS=online offline: LINE_STATUS=offline # 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 ;\ +menue.inc online offline: menue_$(LINE_STATUS).inc + @if diff -qN menue.inc menue_$(LINE_STATUS).inc >/dev/null ;\ then true ;\ - else cp menue_$(LINE_STATUS).lyx menue.lyx ;\ + else cp menue_$(LINE_STATUS).inc menue.inc ;\ fi online offline: $(TARGET_FILES) @@ -61,7 +61,7 @@ $(TARGET_FILES): $(HTML_FILES) $(ASC_FILES) # create tex files from lyx -$(TEX_FILES): menue.lyx $(LYX_FILES) +$(TEX_FILES): menue.inc $(LYX_FILES) lyx -e latex $*.lyx @@ -83,5 +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 + -rm menue.inc diff --git a/documents/asymmetrie/asymmetrie.lyx b/documents/asymmetrie/asymmetrie.lyx index e3f4ad9..0ba9033 100644 --- a/documents/asymmetrie/asymmetrie.lyx +++ b/documents/asymmetrie/asymmetrie.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{../menue.lyx} +\begin_inset Include \input{../menue.inc} preview false \end_inset diff --git a/documents/chaosradio/chaosradio.lyx b/documents/chaosradio/chaosradio.lyx index 3391c63..093b0a9 100644 --- a/documents/chaosradio/chaosradio.lyx +++ b/documents/chaosradio/chaosradio.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{../menue.lyx} +\begin_inset Include \input{../menue.inc} preview false \end_inset diff --git a/documents/copyleft/copyleft.lyx b/documents/copyleft/copyleft.lyx index e5ee59d..d52d501 100644 --- a/documents/copyleft/copyleft.lyx +++ b/documents/copyleft/copyleft.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{../menue.lyx} +\begin_inset Include \input{../menue.inc} preview false \end_inset diff --git a/documents/intro/intro.lyx b/documents/intro/intro.lyx index 79a67e3..0211429 100644 --- a/documents/intro/intro.lyx +++ b/documents/intro/intro.lyx @@ -32,15 +32,12 @@ \layout Standard -\begin_inset Include \input{../menue.lyx} +\begin_inset Include \input{../menue.inc} preview false \end_inset -\layout Standard - - \begin_inset ERT status Open diff --git a/documents/mailserviceanbieter/mailserviceanbieter.lyx b/documents/mailserviceanbieter/mailserviceanbieter.lyx index b8e0c9e..f9f701b 100644 --- a/documents/mailserviceanbieter/mailserviceanbieter.lyx +++ b/documents/mailserviceanbieter/mailserviceanbieter.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{../menue.lyx} +\begin_inset Include \input{../menue.inc} preview false \end_inset diff --git a/documents/mozilla/mozilla.lyx b/documents/mozilla/mozilla.lyx index 989a5ed..806f533 100644 --- a/documents/mozilla/mozilla.lyx +++ b/documents/mozilla/mozilla.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{../menue.lyx} +\begin_inset Include \input{../menue.inc} preview false \end_inset diff --git a/documents/outlook/outlook.lyx b/documents/outlook/outlook.lyx index d63518e..0bb0d55 100644 --- a/documents/outlook/outlook.lyx +++ b/documents/outlook/outlook.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{../menue.lyx} +\begin_inset Include \input{../menue.inc} 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 b67e93b..dcf437e 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{../menue.lyx} +\begin_inset Include \input{../menue.inc} preview false \end_inset diff --git a/documents/senselab/senselab.lyx b/documents/senselab/senselab.lyx index 57eae59..116ca7e 100644 --- a/documents/senselab/senselab.lyx +++ b/documents/senselab/senselab.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{../menue.lyx} +\begin_inset Include \input{../menue.inc} preview false \end_inset diff --git a/documents/thunderbird/thunderbird.lyx b/documents/thunderbird/thunderbird.lyx index 7543f3e..6754d85 100644 --- a/documents/thunderbird/thunderbird.lyx +++ b/documents/thunderbird/thunderbird.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{../menue.lyx} +\begin_inset Include \input{../menue.inc} preview false \end_inset diff --git a/documents/thunderbirdnutzung/thunderbirdnutzung.lyx b/documents/thunderbirdnutzung/thunderbirdnutzung.lyx index 412a425..5498122 100644 --- a/documents/thunderbirdnutzung/thunderbirdnutzung.lyx +++ b/documents/thunderbirdnutzung/thunderbirdnutzung.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{../menue.lyx} +\begin_inset Include \input{../menue.inc} preview false \end_inset diff --git a/documents/warumverschluesselung/warumverschluesselung.lyx b/documents/warumverschluesselung/warumverschluesselung.lyx index ee3a2d3..062675b 100644 --- a/documents/warumverschluesselung/warumverschluesselung.lyx +++ b/documents/warumverschluesselung/warumverschluesselung.lyx @@ -93,7 +93,7 @@ rundum sicher \layout Standard -\begin_inset Include \input{../menue.lyx} +\begin_inset Include \input{../menue.inc} preview false \end_inset diff --git a/documents/wiefunktionierts/wiefunktionierts.lyx b/documents/wiefunktionierts/wiefunktionierts.lyx index 857ed91..bb83da9 100644 --- a/documents/wiefunktionierts/wiefunktionierts.lyx +++ b/documents/wiefunktionierts/wiefunktionierts.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{../menue.lyx} +\begin_inset Include \input{../menue.inc} preview false \end_inset diff --git a/documents/winpt/winpt.lyx b/documents/winpt/winpt.lyx index fddd28f..ca73cf1 100644 --- a/documents/winpt/winpt.lyx +++ b/documents/winpt/winpt.lyx @@ -32,7 +32,7 @@ \layout Standard -\begin_inset Include \input{../menue.lyx} +\begin_inset Include \input{../menue.inc} preview false \end_inset