X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=Makefile;h=f3778e4ce1acc6e5e770e49c4f5ede92725ac9c6;hp=17e2b6634558cfe0b7f49dfa1a739bcfba303913;hb=d40c79f30c4029daa1f92e07b728518911a98d5e;hpb=a3cfcb0acdcb21bc23a2166c442a3bd0dbd18349

diff --git a/Makefile b/Makefile
index 17e2b663..f3778e4c 100644
--- a/Makefile
+++ b/Makefile
@@ -910,12 +910,12 @@ $(INSTALLDIR)/plugins/ufoaiplug.$(DLL): \
 	contrib/ufoaiplug/ufoai_level.o \
 	contrib/ufoaiplug/ufoai.o \
 
-#$(INSTALLDIR)/plugins/bkgrnd2d.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(LIBS_GTK)
-#$(INSTALLDIR)/plugins/bkgrnd2d.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude
-#$(INSTALLDIR)/plugins/bkgrnd2d.$(DLL): \
-#	contrib/bkgrnd2d/bkgrnd2d.o \
-#	contrib/bkgrnd2d/dialog.o \
-#	contrib/bkgrnd2d/plugin.o \
+$(INSTALLDIR)/plugins/bkgrnd2d.$(DLL): LIBS_EXTRA := $(LIBS_GLIB) $(LIBS_GTK)
+$(INSTALLDIR)/plugins/bkgrnd2d.$(DLL): CPPFLAGS_EXTRA := $(CPPFLAGS_GLIB) $(CPPFLAGS_GTK) -Ilibs -Iinclude
+$(INSTALLDIR)/plugins/bkgrnd2d.$(DLL): \
+	contrib/bkgrnd2d/bkgrnd2d.o \
+	contrib/bkgrnd2d/dialog.o \
+	contrib/bkgrnd2d/plugin.o \
 
 $(INSTALLDIR)/heretic2/h2data.$(EXE): LIBS_EXTRA := $(LIBS_XML)
 $(INSTALLDIR)/heretic2/h2data.$(EXE): CPPFLAGS_EXTRA := $(CPPFLAGS_XML) -Itools/quake2/qdata_heretic2/common -Itools/quake2/qdata_heretic2/qcommon -Itools/quake2/qdata_heretic2 -Itools/quake2/common -Ilibs -Iinclude
@@ -960,15 +960,13 @@ install-data: binaries
 	[ "$(OS)" != "Darwin" ] || $(CP_R) setup/data/osx/NetRadiant.app/* $(INSTALLDIR_BASE)/NetRadiant.app/
 	set -ex; \
 	for GAME in games/*; do \
-		if [ -d "$$GAME/tools" ]; then \
-			GAME=$$GAME/tools; \
+		if [ "$$GAME" = "games/*" ]; then \
+			$(ECHO) "Game packs not found, please run"; \
+			$(ECHO) "  ./download-gamepacks.sh"; \
+			$(ECHO) "and then try again!"; \
+		else \
+			CP="$(CP)" CP_R="$(CP_R)" $(SH) install-gamepack.sh "$$GAME" "$(INSTALLDIR)"; \
 		fi; \
-		for GAMEFILE in $$GAME/games/*.game; do \
-			$(CP) "$$GAMEFILE" $(INSTALLDIR)/games/; \
-		done; \
-		for GAMEDIR in $$GAME/*.game; do \
-			$(CP_R) "$$GAMEDIR" $(INSTALLDIR)/; \
-		done; \
 	done
 	$(ECHO) $(RADIANT_MINOR_VERSION) > $(INSTALLDIR)/RADIANT_MINOR
 	$(ECHO) $(RADIANT_MAJOR_VERSION) > $(INSTALLDIR)/RADIANT_MAJOR