BS: fix build plugins; now plugin target is /var/tuxbox/plugins

diff --git a/make/environment.mk b/make/environment.mk
index 8e225bf85715fb48ada86e5601407cc3f79e903e..426613d4469041262ba4d656f4bd31d99c565b70 100755 (executable)
--- a/make/environment.mk
+++ b/make/environment.mk
@@ -169,6 +169,7 @@ GIT_PLUGINS            = $(SOURCE_DIR)/git/PLUGINS
 
 SOURCE  = $(BASE_DIR)/archive-sources
 LIBPLUG = $(TARGETPREFIX)/lib/tuxbox/plugins
+VARPLUG = $(TARGETPREFIX)/var/tuxbox/plugins
 VARCONF = $(TARGETPREFIX)/var/tuxbox/config
 BIN     = $(TARGETPREFIX)/bin
 

diff --git a/make/plugins.mk b/make/plugins.mk
index baf6fdaae2215f8d0fe0c9f2bd5114041e1766a2..fb1f5206e471e431280383d459397df6df60194c 100644 (file)
--- a/make/plugins.mk
+++ b/make/plugins.mk
@@ -2,7 +2,7 @@
 
 $(D)/hddtemp: $(ARCHIVE)/hddtemp-0.3-beta15.tar.bz2
        tar -C $(BUILD_TMP) -xpf $(ARCHIVE)/hddtemp-0.3-beta15.tar.bz2
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        mkdir -p $(BIN) && \
        mkdir -p $(VARCONF) && \
        pushd $(BUILD_TMP)/hddtemp-0.3-beta15 && \
@@ -13,8 +13,8 @@ $(D)/hddtemp: $(ARCHIVE)/hddtemp-0.3-beta15.tar.bz2
                ./configure --host=$(TARGET) --build=$(BUILD) --target=$(TARGET) --with-db-path=/var/tuxbox/config/hddtemp.db && \
                $(MAKE) all
        cp -f $(BUILD_TMP)/hddtemp-0.3-beta15/src/hddtemp $(TARGETPREFIX)/bin
-       cp -f $(SOURCE)/hddtemp/hddtemp.sh $(LIBPLUG)/
-       cp -f $(SOURCE)/hddtemp/hddtemp.cfg $(LIBPLUG)/
+       cp -f $(SOURCE)/hddtemp/hddtemp.sh $(VARPLUG)/
+       cp -f $(SOURCE)/hddtemp/hddtemp.cfg $(VARPLUG)/
        cp -f $(SOURCE)/hddtemp/hddtemp.db $(VARCONF)/
        rm -rf $(BUILD_TMP)/hddtemp-0.3-beta15
        touch $@
@@ -35,7 +35,7 @@ $(D)/cooliTSclimax-nevis:
        mkdir -p $(BIN) && \
        cp -a $(GIT_PLUGINS)/cooliTSclimax $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/cooliTSclimax && \
-               $(TARGET)-g++ $(TARGET_CFLAGS) -D__STDC_CONSTANT_MACROS -L$(TARGETPREFIX)/lib -lz -lfreetype -lssl -lcrypto -lrtmp -lxml2 -lavformat -lavcodec -liconv -lavutil -lm -o $(BUILD_TMP)/cooliTSclimax/cooliTSclimax cooliTSclimax.cpp
+               $(TARGET)-g++ $(TARGET_CFLAGS) -D__STDC_CONSTANT_MACROS -L$(TARGETPREFIX)/lib -lz -lfreetype -lpng -lssl -lcrypto -lrtmp -lxml2 -lavformat -lavcodec -liconv -lavutil -lm -o $(BUILD_TMP)/cooliTSclimax/cooliTSclimax cooliTSclimax.cpp
        cp -f $(BUILD_TMP)/cooliTSclimax/cooliTSclimax $(TARGETPREFIX)/bin/
        rm -rf $(BUILD_TMP)/cooliTSclimax
 
@@ -43,7 +43,7 @@ $(D)/cooliTSclimax-apollo:
        mkdir -p $(BIN) && \
        cp -a $(GIT_PLUGINS)/cooliTSclimax $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/cooliTSclimax && \
-               $(TARGET)-g++ $(TARGET_CFLAGS) -D__STDC_CONSTANT_MACROS -L$(TARGETPREFIX)/lib -lz -lfreetype -lpthread -lssl -lcrypto -lrtmp -lxml2 -lavformat -lavcodec -liconv -lavutil -lm -o $(BUILD_TMP)/cooliTSclimax/cooliTSclimax cooliTSclimax.cpp
+               $(TARGET)-g++ $(TARGET_CFLAGS) -D__STDC_CONSTANT_MACROS -L$(TARGETPREFIX)/lib -lz -lfreetype -lpng -lpthread -lssl -lcrypto -lrtmp -lxml2 -lavformat -lavcodec -liconv -lavutil -lm -o $(BUILD_TMP)/cooliTSclimax/cooliTSclimax cooliTSclimax.cpp
        cp -f $(BUILD_TMP)/cooliTSclimax/cooliTSclimax $(TARGETPREFIX)/bin/
        rm -rf $(BUILD_TMP)/cooliTSclimax
 
@@ -51,7 +51,7 @@ $(D)/cooliTSclimax-kronos:
        mkdir -p $(BIN) && \
        cp -a $(GIT_PLUGINS)/cooliTSclimax $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/cooliTSclimax && \
-               $(TARGET)-g++ $(TARGET_CFLAGS) -D__STDC_CONSTANT_MACROS -L$(TARGETPREFIX)/lib -lz -lfreetype -lpthread -lssl -lcrypto -lrtmp -lxml2 -lavformat -lavcodec -liconv -lavutil -lm -o $(BUILD_TMP)/cooliTSclimax/cooliTSclimax cooliTSclimax.cpp
+               $(TARGET)-g++ $(TARGET_CFLAGS) -D__STDC_CONSTANT_MACROS -L$(TARGETPREFIX)/lib -lz -lfreetype -lpng -lpthread -lssl -lcrypto -lrtmp -lxml2 -lavformat -lavcodec -liconv -lavutil -lm -o $(BUILD_TMP)/cooliTSclimax/cooliTSclimax cooliTSclimax.cpp
        cp -f $(BUILD_TMP)/cooliTSclimax/cooliTSclimax $(TARGETPREFIX)/bin/
        rm -rf $(BUILD_TMP)/cooliTSclimax
 
@@ -61,15 +61,15 @@ $(D)/rcsim:
        touch $@
 
 $(D)/blockads:
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        mkdir -p $(BIN) && \
        mkdir -p $(VARCONF) && \
        cp -a $(GIT_PLUGINS)/blockads $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/blockads && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lfreetype -lz -o $(BUILD_TMP)/blockads/blockad blockad.c globals.c http.c && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lfreetype -lz -o $(BUILD_TMP)/blockads/blockads.so blockads.c gfx.c io.c text.c globals.c http.c
-       cp -f $(BUILD_TMP)/blockads/blockads.so $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/blockads/blockads.cfg $(LIBPLUG)/
+               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lfreetype -lpng -lz -o $(BUILD_TMP)/blockads/blockad blockad.c globals.c http.c && \
+               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lfreetype -lpng -lz -o $(BUILD_TMP)/blockads/blockads.so blockads.c gfx.c io.c text.c globals.c http.c
+       cp -f $(BUILD_TMP)/blockads/blockads.so $(VARPLUG)/
+       cp -f $(BUILD_TMP)/blockads/blockads.cfg $(VARPLUG)/
        cp -f $(BUILD_TMP)/blockads/blockads.conf $(VARCONF)/
        cp -f $(BUILD_TMP)/blockads/blockad $(TARGETPREFIX)/bin/
        rm -rf $(BUILD_TMP)/blockads
@@ -88,7 +88,7 @@ $(D)/input:
        mkdir -p $(BIN) && \
        cp -a $(GIT_PLUGINS)/input $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/input && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lfreetype -lz -o $(BUILD_TMP)/input/input input.c inputd.c gfx.c io.c text.c
+               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lfreetype -lpng -lz -o $(BUILD_TMP)/input/input input.c inputd.c gfx.c io.c text.c
        cp -f $(BUILD_TMP)/input/input $(TARGETPREFIX)/bin/
        rm -rf $(BUILD_TMP)/input
        touch $@
@@ -166,16 +166,16 @@ $(D)/links:
 
 $(D)/logomask:
        mkdir -p $(BIN) && \
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        cp -a $(GIT_PLUGINS)/logomask $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/logomask && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lfreetype -lz -o $(BUILD_TMP)/logomask/logoset.so logoset.c gfx.c io.c text.c && \
+               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lfreetype -lpng -lz -o $(BUILD_TMP)/logomask/logoset.so logoset.c gfx.c io.c text.c && \
                $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(SOURCE_DIR)/neutrino-hd/src -o $(BUILD_TMP)/logomask/logomask.so starter_logomask.c && \
                $(TARGET)-gcc $(TARGET_CFLAGS) -o $(BUILD_TMP)/logomask/logomask logomask.c gfx.c
-       cp -f $(BUILD_TMP)/logomask/logoset.so $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/logomask/logoset.cfg $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/logomask/logomask.so $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/logomask/logomask.cfg $(LIBPLUG)/
+       cp -f $(BUILD_TMP)/logomask/logoset.so $(VARPLUG)/
+       cp -f $(BUILD_TMP)/logomask/logoset.cfg $(VARPLUG)/
+       cp -f $(BUILD_TMP)/logomask/logomask.so $(VARPLUG)/
+       cp -f $(BUILD_TMP)/logomask/logomask.cfg $(VARPLUG)/
        cp -f $(BUILD_TMP)/logomask/logomask.sh $(TARGETPREFIX)/bin/
        cp -f $(BUILD_TMP)/logomask/logomask $(TARGETPREFIX)/bin/
        rm -rf $(BUILD_TMP)/logomask
@@ -223,83 +223,83 @@ $(D)/msgbox:
        mkdir -p $(BIN) && \
        cp -a $(GIT_PLUGINS)/msgbox $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/msgbox && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lfreetype -lz -o $(BUILD_TMP)/msgbox/msgbox msgbox.c gfx.c io.c text.c txtform.c
+               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lfreetype -lpng -lz -o $(BUILD_TMP)/msgbox/msgbox msgbox.c gfx.c io.c text.c txtform.c
        cp -f $(BUILD_TMP)/msgbox/msgbox $(TARGETPREFIX)/bin/
        rm -rf $(BUILD_TMP)/msgbox
        touch $@
 
 $(D)/shellexec:
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        mkdir -p $(BIN) && \
        mkdir -p $(VARCONF) && \
        cp -a $(GIT_PLUGINS)/shellexec $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/shellexec && \
                $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(SOURCE_DIR)/neutrino-hd/src -g -o $(BUILD_TMP)/shellexec/shellexec.so starter.c && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lfreetype -lz -o $(BUILD_TMP)/shellexec/shellexec shellexec.c gfx.c io.c text.c
-       cp -f $(BUILD_TMP)/shellexec/shellexec.so $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/shellexec/shellexec.cfg $(LIBPLUG)/
+               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lfreetype -lpng -lz -o $(BUILD_TMP)/shellexec/shellexec shellexec.c gfx.c io.c text.c
+       cp -f $(BUILD_TMP)/shellexec/shellexec.so $(VARPLUG)/
+       cp -f $(BUILD_TMP)/shellexec/shellexec.cfg $(VARPLUG)/
        cp -f $(BUILD_TMP)/shellexec/shellexec.conf $(VARCONF)/
        cp -f $(BUILD_TMP)/shellexec/shellexec $(TARGETPREFIX)/bin/
        rm -rf $(BUILD_TMP)/shellexec
        touch $@
 
 $(D)/tuxcal: $(D)/freetype
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        mkdir -p $(BIN) && \
        mkdir -p $(VARCONF)/tuxcal && \
        cp -a $(GIT_PLUGINS)/tuxcal $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/tuxcal && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lfreetype -lz -o $(BUILD_TMP)/tuxcal/tuxcal.so tuxcal.c
+               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lfreetype -lpng -lz -o $(BUILD_TMP)/tuxcal/tuxcal.so tuxcal.c
        pushd $(BUILD_TMP)/tuxcal/daemon && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lpthread -lfreetype -lz -o $(BUILD_TMP)/tuxcal/daemon/tuxcald tuxcald.c
+               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lpthread -lfreetype -lpng -lz -o $(BUILD_TMP)/tuxcal/daemon/tuxcald tuxcald.c
        sed -i -e 's#name=Kalender#name=CS-Tuxcalender#' $(BUILD_TMP)/tuxcal/tuxcal.cfg && \
-       cp -f $(BUILD_TMP)/tuxcal/tuxcal.so $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/tuxcal/tuxcal.cfg $(LIBPLUG)/
+       cp -f $(BUILD_TMP)/tuxcal/tuxcal.so $(VARPLUG)/
+       cp -f $(BUILD_TMP)/tuxcal/tuxcal.cfg $(VARPLUG)/
        cp -f $(BUILD_TMP)/tuxcal/tuxcal.conf $(VARCONF)/tuxcal/
        cp -f $(BUILD_TMP)/tuxcal/daemon/tuxcald $(TARGETPREFIX)/bin/
        rm -rf $(BUILD_TMP)/tuxcal
        touch $@
 
 $(D)/tuxcom: $(D)/freetype
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        cp -a $(GIT_PLUGINS)/tuxcom $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/tuxcom && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lfreetype -lz -o $(BUILD_TMP)/tuxcom/tuxcom.so tuxcom.c
+               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lfreetype -lpng -lz -o $(BUILD_TMP)/tuxcom/tuxcom.so tuxcom.c
        sed -i -e 's#name=TuxBox Commander#name=CS-Tuxcommander#' $(BUILD_TMP)/tuxcom/tuxcom.cfg && \
        sed -i -e 's#desc=file manager#desc=Datei Editor#' $(BUILD_TMP)/tuxcom/tuxcom.cfg && \
-       cp -f $(BUILD_TMP)/tuxcom/tuxcom.so $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/tuxcom/tuxcom.cfg $(LIBPLUG)/
+       cp -f $(BUILD_TMP)/tuxcom/tuxcom.so $(VARPLUG)/
+       cp -f $(BUILD_TMP)/tuxcom/tuxcom.cfg $(VARPLUG)/
        rm -rf $(BUILD_TMP)/tuxcom
        touch $@
 
 $(D)/tuxmail: $(D)/freetype
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        mkdir -p $(BIN) && \
        mkdir -p $(VARCONF)/tuxmail && \
        cp -a $(GIT_PLUGINS)/tuxmail $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/tuxmail && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lfreetype -lz -o $(BUILD_TMP)/tuxmail/tuxmail.so tuxmail.c
+               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lfreetype -lpng -lz -o $(BUILD_TMP)/tuxmail/tuxmail.so tuxmail.c
        pushd $(BUILD_TMP)/tuxmail/daemon && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lpthread -lfreetype -lssl -lcrypto -lz -o $(BUILD_TMP)/tuxmail/daemon/tuxmaild tuxmaild.c
+               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lpthread -lfreetype -lpng -lssl -lcrypto -lz -o $(BUILD_TMP)/tuxmail/daemon/tuxmaild tuxmaild.c
        sed -i -e 's#name=E-Mail#name=CS-Tuxmail#' $(BUILD_TMP)/tuxmail/tuxmail.cfg && \
        sed -i -e 's#desc=Kontenübersicht#desc=E-Mail Kontenübersicht#' $(BUILD_TMP)/tuxmail/tuxmail.cfg && \
-       cp -f $(BUILD_TMP)/tuxmail/tuxmail.so $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/tuxmail/tuxmail.cfg $(LIBPLUG)/
+       cp -f $(BUILD_TMP)/tuxmail/tuxmail.so $(VARPLUG)/
+       cp -f $(BUILD_TMP)/tuxmail/tuxmail.cfg $(VARPLUG)/
        cp -f $(BUILD_TMP)/tuxmail/tuxmail.conf $(VARCONF)/tuxmail/
        cp -f $(BUILD_TMP)/tuxmail/daemon/tuxmaild $(TARGETPREFIX)/bin/
        rm -rf $(BUILD_TMP)/tuxmail
        touch $@
 
 $(D)/tuxwetter: $(D)/freetype
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        mkdir -p $(BIN) && \
        mkdir -p $(VARCONF)/tuxwetter && \
        cp -a $(GIT_PLUGINS)/tuxwetter $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/tuxwetter && \
                $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(SOURCE_DIR)/neutrino-hd/src -g -o $(BUILD_TMP)/tuxwetter/tuxwetter starter.c && \
-               $(TARGET)-gcc -Wall $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lpthread -lfreetype -lz -DWWEATHER -lssl -lcrypto -lrtmp -lcurl -ljpeg -lpng -lungif gifdecomp.c -o $(BUILD_TMP)/tuxwetter/tuxwetter.so tuxwetter.c gfx.c io.c text.c parser.c php.c http.c jpeg.c fb_display.c resize.c pngw.c gif.c
-       cp -f $(BUILD_TMP)/tuxwetter/tuxwetter.so $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/tuxwetter/tuxwetter.cfg $(LIBPLUG)/
+               $(TARGET)-gcc -Wall $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -lpthread -lfreetype -lpng -lz -DWWEATHER -lssl -lcrypto -lrtmp -lcurl -ljpeg -lpng -lungif gifdecomp.c -o $(BUILD_TMP)/tuxwetter/tuxwetter.so tuxwetter.c gfx.c io.c text.c parser.c php.c http.c jpeg.c fb_display.c resize.c pngw.c gif.c
+       cp -f $(BUILD_TMP)/tuxwetter/tuxwetter.so $(VARPLUG)/
+       cp -f $(BUILD_TMP)/tuxwetter/tuxwetter.cfg $(VARPLUG)/
        cp -f $(BUILD_TMP)/tuxwetter/tuxwetter.conf $(VARCONF)/tuxwetter/
        cp -f $(BUILD_TMP)/tuxwetter/tuxwetter.mcfg $(VARCONF)/tuxwetter/
        cp -f $(BUILD_TMP)/tuxwetter/startbild.jpg $(VARCONF)/tuxwetter/
@@ -325,189 +325,189 @@ $(D)/libfx2: $(D)/freetype
        cp -a $(SOURCE)/libfx2 $(BUILD_TMP)/ && \
        cp -a $(SOURCE)/libfx2 $(TARGETPREFIX)/include/ && \
        pushd $(BUILD_TMP)/libfx2 && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -lfreetype -lz -O2 -shared -fpic -o $(BUILD_TMP)/libfx2/libfx2.so draw.c math.c rcinput.c
+               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -lfreetype -lpng -lz -O2 -shared -fpic -o $(BUILD_TMP)/libfx2/libfx2.so draw.c math.c rcinput.c
        cp -f $(BUILD_TMP)/libfx2/libfx2.so $(TARGETPREFIX)/lib/
        rm -rf $(BUILD_TMP)/libfx2
        touch $@
 
 $(D)/snake: $(D)/libfx2
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        cp -a $(SOURCE)/snake $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/snake && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -lfreetype -lz -O2 -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/snake/snake.so snake.c somain.c
-       cp -f $(BUILD_TMP)/snake/snake.so $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/snake/snake.cfg $(LIBPLUG)/
+               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -lfreetype -lpng -lz -O2 -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/snake/snake.so snake.c somain.c
+       cp -f $(BUILD_TMP)/snake/snake.so $(VARPLUG)/
+       cp -f $(BUILD_TMP)/snake/snake.cfg $(VARPLUG)/
        rm -rf $(BUILD_TMP)/snake
        touch $@
 
 $(D)/sol: $(D)/libfx2
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        cp -a $(SOURCE)/sol $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/sol && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -lfreetype -lz -O2 -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/sol/sol.so solboard.c somain.c
-       cp -f $(BUILD_TMP)/sol/sol.so $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/sol/sol.cfg $(LIBPLUG)/
+               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -lfreetype -lpng -lz -O2 -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/sol/sol.so solboard.c somain.c
+       cp -f $(BUILD_TMP)/sol/sol.so $(VARPLUG)/
+       cp -f $(BUILD_TMP)/sol/sol.cfg $(VARPLUG)/
        rm -rf $(BUILD_TMP)/sol
        touch $@
 
 $(D)/pac: $(D)/libfx2
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        cp -a $(SOURCE)/pac $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/pac && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -lfreetype -lz -O2 -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/pac/pacman.so maze.c somain.c
-       cp -f $(BUILD_TMP)/pac/pacman.so $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/pac/pacman.cfg $(LIBPLUG)/
+               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -lfreetype -lpng -lz -O2 -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/pac/pacman.so maze.c somain.c
+       cp -f $(BUILD_TMP)/pac/pacman.so $(VARPLUG)/
+       cp -f $(BUILD_TMP)/pac/pacman.cfg $(VARPLUG)/
        rm -rf $(BUILD_TMP)/pac
        touch $@
 
 $(D)/tank: $(D)/libfx2
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        cp -a $(SOURCE)/tank $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/tank && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -lfreetype -lz -O2 -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/tank/tank.so board.c somain.c
-       cp -f $(BUILD_TMP)/tank/tank.so $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/tank/tank.cfg $(LIBPLUG)/
+               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -lfreetype -lpng -lz -O2 -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/tank/tank.so board.c somain.c
+       cp -f $(BUILD_TMP)/tank/tank.so $(VARPLUG)/
+       cp -f $(BUILD_TMP)/tank/tank.cfg $(VARPLUG)/
        rm -rf $(BUILD_TMP)/tank
        touch $@
 
 $(D)/mines: $(D)/libfx2
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        cp -a $(SOURCE)/mines $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/mines && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -lfreetype -lz -O2 -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/mines/mines.so board.c somain.c
-       cp -f $(BUILD_TMP)/mines/mines.so $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/mines/mines.cfg $(LIBPLUG)/
+               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -lfreetype -lpng -lz -O2 -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/mines/mines.so board.c somain.c
+       cp -f $(BUILD_TMP)/mines/mines.so $(VARPLUG)/
+       cp -f $(BUILD_TMP)/mines/mines.cfg $(VARPLUG)/
        rm -rf $(BUILD_TMP)/mines
        touch $@
 
 $(D)/master: $(D)/libfx2
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        cp -a $(SOURCE)/master $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/master && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -lfreetype -lz -O2 -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/master/master.so board.c somain.c
-       cp -f $(BUILD_TMP)/master/master.so $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/master/master.cfg $(LIBPLUG)/
+               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -lfreetype -lpng -lz -O2 -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/master/master.so board.c somain.c
+       cp -f $(BUILD_TMP)/master/master.so $(VARPLUG)/
+       cp -f $(BUILD_TMP)/master/master.cfg $(VARPLUG)/
        rm -rf $(BUILD_TMP)/master
        touch $@
 
 $(D)/tetris: $(D)/libfx2
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        cp -a $(SOURCE)/tetris $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/tetris && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -lfreetype -lz -O2 -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/tetris/tetris.so board.c somain.c
-       cp -f $(BUILD_TMP)/tetris/tetris.so $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/tetris/tetris.cfg $(LIBPLUG)/
+               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -lfreetype -lpng -lz -O2 -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/tetris/tetris.so board.c somain.c
+       cp -f $(BUILD_TMP)/tetris/tetris.so $(VARPLUG)/
+       cp -f $(BUILD_TMP)/tetris/tetris.cfg $(VARPLUG)/
        rm -rf $(BUILD_TMP)/tetris
        touch $@
 
 $(D)/vierg: $(D)/libfx2
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        cp -a $(SOURCE)/vierg $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/vierg && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lz -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/vierg/vierg.so board.c somain.c
-       cp -f $(BUILD_TMP)/vierg/vierg.so $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/vierg/vierg.cfg $(LIBPLUG)/
+               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lpng -lz -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/vierg/vierg.so board.c somain.c
+       cp -f $(BUILD_TMP)/vierg/vierg.so $(VARPLUG)/
+       cp -f $(BUILD_TMP)/vierg/vierg.cfg $(VARPLUG)/
        rm -rf $(BUILD_TMP)/vierg
        touch $@
 
 $(D)/yahtzee: $(D)/libfx2
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        cp -a $(SOURCE)/yahtzee $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/yahtzee && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lz -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/yahtzee/yahtzee.so yahtzee.c somain.c
-       cp -f $(BUILD_TMP)/yahtzee/yahtzee.so $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/yahtzee/yahtzee.cfg $(LIBPLUG)/
+               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lpng -lz -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/yahtzee/yahtzee.so yahtzee.c somain.c
+       cp -f $(BUILD_TMP)/yahtzee/yahtzee.so $(VARPLUG)/
+       cp -f $(BUILD_TMP)/yahtzee/yahtzee.cfg $(VARPLUG)/
        rm -rf $(BUILD_TMP)/yahtzee
        touch $@
 
 $(D)/sokoban: $(D)/libfx2
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        mkdir -p $(TARGETPREFIX)/var/tuxbox/config/sokoban && \
        cp -a $(SOURCE)/sokoban $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/sokoban && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lz -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/sokoban/soko.so board.c somain.c
-       cp -f $(BUILD_TMP)/sokoban/soko.so $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/sokoban/soko.cfg $(LIBPLUG)/
+               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lpng -lz -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/sokoban/soko.so board.c somain.c
+       cp -f $(BUILD_TMP)/sokoban/soko.so $(VARPLUG)/
+       cp -f $(BUILD_TMP)/sokoban/soko.cfg $(VARPLUG)/
        cp -f $(BUILD_TMP)/sokoban/*.xsb $(TARGETPREFIX)/var/tuxbox/config/sokoban/
        rm -rf $(BUILD_TMP)/sokoban
        touch $@
 
 $(D)/sudoku: $(D)/libfx2
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        cp -a $(SOURCE)/sudoku $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/sudoku && \
-               $(TARGET)-g++ $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lz -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/sudoku/sudoku.so misc.cpp menu.cpp sudoku.cpp board.cpp somain.cpp
-       cp -f $(BUILD_TMP)/sudoku/sudoku.so $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/sudoku/sudoku.cfg $(LIBPLUG)/
+               $(TARGET)-g++ $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lpng -lz -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/sudoku/sudoku.so misc.cpp menu.cpp sudoku.cpp board.cpp somain.cpp
+       cp -f $(BUILD_TMP)/sudoku/sudoku.so $(VARPLUG)/
+       cp -f $(BUILD_TMP)/sudoku/sudoku.cfg $(VARPLUG)/
        rm -rf $(BUILD_TMP)/sudoku
        touch $@
 
 $(D)/lemm: $(D)/libfx2
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        cp -a $(SOURCE)/lemm $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/lemm && \
-               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lz -ljpeg  -lpng -lungif -lfx2 -lpthread -o $(BUILD_TMP)/lemm/lemmings.so somain.c sprite.c lemm.c pic.c sound.c double.c
-       cp -f $(BUILD_TMP)/lemm/lemmings.so $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/lemm/lemmings.cfg $(LIBPLUG)/
+               $(TARGET)-gcc $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lpng -lz -ljpeg  -lpng -lungif -lfx2 -lpthread -o $(BUILD_TMP)/lemm/lemmings.so somain.c sprite.c lemm.c pic.c sound.c double.c
+       cp -f $(BUILD_TMP)/lemm/lemmings.so $(VARPLUG)/
+       cp -f $(BUILD_TMP)/lemm/lemmings.cfg $(VARPLUG)/
        rm -rf $(BUILD_TMP)/lemm
        touch $@
 
 #broken!!!
 $(D)/solitair: $(D)/libfx2
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        cp -a $(SOURCE)/solitair $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/solitair && \
-               $(TARGET)-g++ $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lz -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/solitair/solitair.so Block.cpp Buffer.cpp Card.cpp Foundation.cpp Hand.cpp Slot.cpp Table.cpp Tableau.cpp Wastepile.cpp somain.cpp pnm_file.cpp pnm_res.cpp backbuffer.cpp
-       cp -f $(BUILD_TMP)/solitair/solitair.so $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/solitair/solitair.cfg $(LIBPLUG)/
+               $(TARGET)-g++ $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lpng -lz -ljpeg  -lpng -lungif -lfx2 -o $(BUILD_TMP)/solitair/solitair.so Block.cpp Buffer.cpp Card.cpp Foundation.cpp Hand.cpp Slot.cpp Table.cpp Tableau.cpp Wastepile.cpp somain.cpp pnm_file.cpp pnm_res.cpp backbuffer.cpp
+       cp -f $(BUILD_TMP)/solitair/solitair.so $(VARPLUG)/
+       cp -f $(BUILD_TMP)/solitair/solitair.cfg $(VARPLUG)/
        rm -rf $(BUILD_TMP)/solitair
        touch $@
 
 $(D)/c64emu: $(D)/libfx2
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        cp -a $(SOURCE)/c64emu $(BUILD_TMP)/ && \
        pushd $(BUILD_TMP)/c64emu && \
-               $(TARGET)-g++ $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lz -ljpeg  -lpng -lungif -lfx2 -lm -o $(BUILD_TMP)/c64emu/c64emu.so main.cpp Display.cpp Prefs.cpp SID.cpp REU.cpp IEC.cpp 1541fs.cpp 1541d64.cpp 1541t64.cpp 1541job.cpp SAM.cpp CmdPipe.cpp C64.cpp CPUC64.cpp VIC.cpp CIA.cpp CPU1541.cpp vga.c
-       mkdir -p $(LIBPLUG)/c64emu && \
-       cp -f $(BUILD_TMP)/c64emu/c64emu.so $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/c64emu/c64emu.cfg $(LIBPLUG)/
-       cp -f $(BUILD_TMP)/c64emu/ROMS/* $(LIBPLUG)/c64emu/
+               $(TARGET)-g++ $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/freetype2 -I$(TARGETPREFIX)/include/libfx2 -O2 -lfreetype -lpng -lz -ljpeg  -lpng -lungif -lfx2 -lm -o $(BUILD_TMP)/c64emu/c64emu.so main.cpp Display.cpp Prefs.cpp SID.cpp REU.cpp IEC.cpp 1541fs.cpp 1541d64.cpp 1541t64.cpp 1541job.cpp SAM.cpp CmdPipe.cpp C64.cpp CPUC64.cpp VIC.cpp CIA.cpp CPU1541.cpp vga.c
+       mkdir -p $(VARPLUG)/c64emu && \
+       cp -f $(BUILD_TMP)/c64emu/c64emu.so $(VARPLUG)/
+       cp -f $(BUILD_TMP)/c64emu/c64emu.cfg $(VARPLUG)/
+       cp -f $(BUILD_TMP)/c64emu/ROMS/* $(VARPLUG)/c64emu/
        rm -rf $(BUILD_TMP)/c64emu
        touch $@
 
 $(D)/boerse:
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        pushd $(SOURCE)/boerse && \
-       cp -f boerse.sh $(LIBPLUG)/
+       cp -f boerse.sh $(VARPLUG)/
        touch $@
 
 $(D)/rssnews:
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        pushd $(SOURCE)/rssnews && \
-       cp -f rssnews.sh $(LIBPLUG)/
+       cp -f rssnews.sh $(VARPLUG)/
        touch $@
 
 $(D)/tanken:
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        pushd $(SOURCE)/tanken && \
-       cp -f tanken $(LIBPLUG)/
+       cp -f tanken $(VARPLUG)/
        touch $@
 
 $(D)/wetter:
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        pushd $(SOURCE)/wetter && \
-       cp -f wetter $(LIBPLUG)/
+       cp -f wetter $(VARPLUG)/
        touch $@
 
 $(D)/liga_nat:
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        pushd $(SOURCE)/liga_nat && \
-       cp -f liga_nat $(LIBPLUG)/
+       cp -f liga_nat $(VARPLUG)/
        touch $@
 
 $(D)/formel1:
-       mkdir -p $(LIBPLUG) && \
+       mkdir -p $(VARPLUG) && \
        pushd $(SOURCE)/formel1 && \
-       cp -f f1kalender $(LIBPLUG)/ && \
-       cp -f formel1wmtab $(LIBPLUG)/
+       cp -f f1kalender $(VARPLUG)/ && \
+       cp -f formel1wmtab $(VARPLUG)/
        touch $@