--- icedtea-web-1.2~pre3.orig/Makefile.am +++ icedtea-web-1.2~pre3/Makefile.am @@ -213,7 +213,7 @@ $(PLUGIN_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc mkdir -p $(PLUGIN_DIR) && \ cd $(PLUGIN_DIR) && \ $(CXX) $(CXXFLAGS) \ - $(DEFS) $(VERSION_DEFS) \ + $(DEFS) \ -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \ -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \ -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \ @@ -221,6 +221,7 @@ $(PLUGIN_DIR)/%.o: $(PLUGIN_SRCDIR)/%.cc -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \ -DICEDTEA_WEB_JRE="\"$(SYSTEM_JRE_DIR)\"" \ -DPLUGIN_BOOTCLASSPATH=$(PLUGIN_BOOTCLASSPATH) \ + $(VERSION_DEFS) \ $(GLIB_CFLAGS) \ $(GTK_CFLAGS) \ $(MOZILLA_CFLAGS) \ --- icedtea-web-1.2~pre3.orig/Makefile.in +++ icedtea-web-1.2~pre3/Makefile.in @@ -718,7 +718,7 @@ uninstall-local: @ENABLE_PLUGIN_TRUE@ mkdir -p $(PLUGIN_DIR) && \ @ENABLE_PLUGIN_TRUE@ cd $(PLUGIN_DIR) && \ @ENABLE_PLUGIN_TRUE@ $(CXX) $(CXXFLAGS) \ -@ENABLE_PLUGIN_TRUE@ $(DEFS) $(VERSION_DEFS) \ +@ENABLE_PLUGIN_TRUE@ $(DEFS) \ @ENABLE_PLUGIN_TRUE@ -DJDK_UPDATE_VERSION="\"$(JDK_UPDATE_VERSION)\"" \ @ENABLE_PLUGIN_TRUE@ -DPLUGIN_NAME="\"IcedTea-Web Plugin\"" \ @ENABLE_PLUGIN_TRUE@ -DPLUGIN_VERSION="\"$(PLUGIN_VERSION)\"" \ @@ -726,6 +726,7 @@ uninstall-local: @ENABLE_PLUGIN_TRUE@ -DMOZILLA_VERSION_COLLAPSED="$(MOZILLA_VERSION_COLLAPSED)" \ @ENABLE_PLUGIN_TRUE@ -DICEDTEA_WEB_JRE="\"$(SYSTEM_JRE_DIR)\"" \ @ENABLE_PLUGIN_TRUE@ -DPLUGIN_BOOTCLASSPATH=$(PLUGIN_BOOTCLASSPATH) \ +@ENABLE_PLUGIN_TRUE@ $(VERSION_DEFS) \ @ENABLE_PLUGIN_TRUE@ $(GLIB_CFLAGS) \ @ENABLE_PLUGIN_TRUE@ $(GTK_CFLAGS) \ @ENABLE_PLUGIN_TRUE@ $(MOZILLA_CFLAGS) \