die Menue-Einfuegung verbessert

Vorsicht: es klappt noch nicht - tex mag es wohl nicht, Dateien aus dem parent directory einzubinden
This commit is contained in:
lars 2005-05-14 14:39:20 +00:00
parent a028ae2019
commit 8d66d208a0
16 changed files with 25 additions and 27 deletions

View file

@ -102,12 +102,13 @@ doku: cd-template
@echo "Aktualisiere das Doku-Verzeichnis ..." @echo "Aktualisiere das Doku-Verzeichnis ..."
# aufgrund einer Seltsamkeit im doku-Makefile, muss es zweimal aufgerufen werden, # aufgrund einer Seltsamkeit im doku-Makefile, muss es zweimal aufgerufen werden,
# wenn der online- zum offline-Status geaendert wird (und umgekehrt) # wenn der online- zum offline-Status geaendert wird (und umgekehrt)
@make -C documents $(LINE_STATUS) install @make -C documents $(LINE_STATUS)
@make -C documents $(LINE_STATUS) install @make -C documents install
setze_releaseinfos: cd-template setze_releaseinfos: cd-template
@echo "Passe version.txt an ..." # ein nutzloses Relikt, oder nur der falsche Dateiname?
sed -i 's/REVISIONS_PLATZHALTER/$(ARBEITS_REVISION)/g; s/DATUMS_PLATZHALTER/$(REVISIONS_DATUM)/g' $(CCD_BUILD_DIR)/version.txt # @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: hole_quell_daten:
@if [ ! -e "$(MIRROR_QUELLE_DIR)" ] ;\ @if [ ! -e "$(MIRROR_QUELLE_DIR)" ] ;\
@ -152,7 +153,7 @@ release: EXPORT_FILE_SUFFIX := _small
release_all: EXPORT_FILE_SUFFIX := _all release_all: EXPORT_FILE_SUFFIX := _all
release_all: verlinke_chaosradio verlinke_programme 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 ..." @echo "Erzeuge zip-Archiv ..."
@$(ERZEUGE_ZIP) @$(ERZEUGE_ZIP)
@echo "Erzeuge iso-Image ..." @echo "Erzeuge iso-Image ..."

View file

@ -46,10 +46,10 @@ online: LINE_STATUS=online
offline: LINE_STATUS=offline offline: LINE_STATUS=offline
# pruefen, ob die Menue-Datei durch eine neuere ersetzt werden muss - ansonsten: ignorieren # pruefen, ob die Menue-Datei durch eine neuere ersetzt werden muss - ansonsten: ignorieren
menue.lyx online offline: menue_$(LINE_STATUS).lyx menue.inc online offline: menue_$(LINE_STATUS).inc
@if diff -qN menue.lyx menue_$(LINE_STATUS).lyx >/dev/null ;\ @if diff -qN menue.inc menue_$(LINE_STATUS).inc >/dev/null ;\
then true ;\ then true ;\
else cp menue_$(LINE_STATUS).lyx menue.lyx ;\ else cp menue_$(LINE_STATUS).inc menue.inc ;\
fi fi
online offline: $(TARGET_FILES) online offline: $(TARGET_FILES)
@ -61,7 +61,7 @@ $(TARGET_FILES): $(HTML_FILES) $(ASC_FILES)
# create tex files from lyx # create tex files from lyx
$(TEX_FILES): menue.lyx $(LYX_FILES) $(TEX_FILES): menue.inc $(LYX_FILES)
lyx -e latex $*.lyx lyx -e latex $*.lyx
@ -83,5 +83,5 @@ clean:
-rm -r _output 2>/dev/null -rm -r _output 2>/dev/null
-rm $(foreach dir,$(DOCUMENT_NAMES),$(dir)/WARNINGS) 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 $(foreach dir,$(DOCUMENT_NAMES),$(dir)/$(dir).emergency) 2>/dev/null
-rm menue.lyx menue.tex -rm menue.inc

View file

@ -32,7 +32,7 @@
\layout Standard \layout Standard
\begin_inset Include \input{../menue.lyx} \begin_inset Include \input{../menue.inc}
preview false preview false
\end_inset \end_inset

View file

@ -32,7 +32,7 @@
\layout Standard \layout Standard
\begin_inset Include \input{../menue.lyx} \begin_inset Include \input{../menue.inc}
preview false preview false
\end_inset \end_inset

View file

@ -32,7 +32,7 @@
\layout Standard \layout Standard
\begin_inset Include \input{../menue.lyx} \begin_inset Include \input{../menue.inc}
preview false preview false
\end_inset \end_inset

View file

@ -32,15 +32,12 @@
\layout Standard \layout Standard
\begin_inset Include \input{../menue.lyx} \begin_inset Include \input{../menue.inc}
preview false preview false
\end_inset \end_inset
\layout Standard
\begin_inset ERT \begin_inset ERT
status Open status Open

View file

@ -32,7 +32,7 @@
\layout Standard \layout Standard
\begin_inset Include \input{../menue.lyx} \begin_inset Include \input{../menue.inc}
preview false preview false
\end_inset \end_inset

View file

@ -32,7 +32,7 @@
\layout Standard \layout Standard
\begin_inset Include \input{../menue.lyx} \begin_inset Include \input{../menue.inc}
preview false preview false
\end_inset \end_inset

View file

@ -32,7 +32,7 @@
\layout Standard \layout Standard
\begin_inset Include \input{../menue.lyx} \begin_inset Include \input{../menue.inc}
preview false preview false
\end_inset \end_inset

View file

@ -32,7 +32,7 @@
\layout Standard \layout Standard
\begin_inset Include \input{../menue.lyx} \begin_inset Include \input{../menue.inc}
preview false preview false
\end_inset \end_inset

View file

@ -32,7 +32,7 @@
\layout Standard \layout Standard
\begin_inset Include \input{../menue.lyx} \begin_inset Include \input{../menue.inc}
preview false preview false
\end_inset \end_inset

View file

@ -32,7 +32,7 @@
\layout Standard \layout Standard
\begin_inset Include \input{../menue.lyx} \begin_inset Include \input{../menue.inc}
preview false preview false
\end_inset \end_inset

View file

@ -32,7 +32,7 @@
\layout Standard \layout Standard
\begin_inset Include \input{../menue.lyx} \begin_inset Include \input{../menue.inc}
preview false preview false
\end_inset \end_inset

View file

@ -93,7 +93,7 @@ rundum sicher
\layout Standard \layout Standard
\begin_inset Include \input{../menue.lyx} \begin_inset Include \input{../menue.inc}
preview false preview false
\end_inset \end_inset

View file

@ -32,7 +32,7 @@
\layout Standard \layout Standard
\begin_inset Include \input{../menue.lyx} \begin_inset Include \input{../menue.inc}
preview false preview false
\end_inset \end_inset

View file

@ -32,7 +32,7 @@
\layout Standard \layout Standard
\begin_inset Include \input{../menue.lyx} \begin_inset Include \input{../menue.inc}
preview false preview false
\end_inset \end_inset