Author: af
Date: Wed Oct 30 08:29:22 2013
New Revision: 1537000
URL: http://svn.apache.org/r1537000
Log:
123532: Removed support for deprecated BUILD_SPECIAL flag.
Modified:
openoffice/trunk/main/instsetoo_native/util/makefile.mk
Modified: openoffice/trunk/main/instsetoo_native/util/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/util/makefile.mk?rev=1537000&r1=1536999&r2=1537000&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/util/makefile.mk (original)
+++ openoffice/trunk/main/instsetoo_native/util/makefile.mk Wed Oct 30 08:29:22
2013
@@ -160,11 +160,6 @@ MSIOFFICETEMPLATESOURCE=$(PRJ)$/inc_open
MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates
MSISDKOOTEMPLATESOURCE=$(PRJ)$/inc_sdkoo$/windows$/msi_templates
-.IF "$(BUILD_SPECIAL)"!=""
-MSIOFFICETEMPLATEDIR=$(MSIOFFICETEMPLATESOURCE)
-MSILANGPACKTEMPLATEDIR=$(MSILANGPACKTEMPLATESOURCE)
-MSISDKOOTEMPLATEDIR=$(MSISDKOOTEMPLATESOURCE)
-.ELSE # "$(BUILD_SPECIAL)"!=""
NOLOGOSPLASH:=$(BIN)$/intro.zip
DEVNOLOGOSPLASH:=$(BIN)$/dev$/intro.zip
MSIOFFICETEMPLATEDIR=$(MISC)$/openoffice$/msi_templates
@@ -196,8 +191,6 @@ $(foreach,i,$(alllangiso) sdkoodev_$i) :
$(MAKETARGETS) : $(ADDDEPS)
.ENDIF # "$(MAKETARGETS)"!=""
-.ENDIF # "$(BUILD_SPECIAL)"!=""
-
$(foreach,i,$(alllangiso) openoffice_$i) : $$@{$(PKGFORMAT:^".")}
.IF "$(MAKETARGETS)"!=""
.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
