Removed support for old obsolete JAVA_PACKAGE_PREFIX

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@10271 72102866-910b-0410-8b05-ffd578937521

java.make

@@ -47,11 +47,6 @@ JAVA_PACKAGE_MAKE_LOADED=yes
 # JAVA_INSTALLATION_DIR, as in the following example - 
 # JAVA_INSTALLATION_DIR = $(GNUSTEP_JAVA)/gnu/gnustep/base/
 #
-# ((deprecated and will be removed)) The old way of managing this is
-# by using another variable, called JAVA_PACKAGE_PREFIX: if non null,
-# files will be installed in:
-# ${JAVA_INSTALLATION_DIR)/${JAVA_PACKAGE_PREFIX}/{relative path}.
-#
 # If you have java sources to be processed throught JAVAH to create
 # JNI headers, specify the files in xxx_JAVA_JNI_FILES.  The headers
 # will be placed together with the source file (example: the header of
@@ -104,27 +99,13 @@ after-$(TARGET)-all::
 
 internal-java_package-install:: internal-java_package-all install-java_package
 
-# Support old unflexible way (JAVA_PACKAGE_PREFIX) to customize
-# installation dir - deprecated and will be removed to keep the code clean.
-
-# Deprecated on 25 Apr 2001.  Will be removed any time after 25 Jun 2001.
-
-ifneq ($(JAVA_PACKAGE_PREFIX),)
-  $(warning "WARNING - JAVA_PACKAGE_PREFIX is deprecated and will be removed - use JAVA_INSTALLATION_DIR instead")
-  _WE_INSTALL_INTO=$(JAVA_INSTALLATION_DIR)/$(JAVA_PACKAGE_PREFIX)
-else
-  # When JAVA_PACKAGE_PREFIX is removed, simply replace all occurrences 
-  # of _WE_INSTALL_INTO with JAVA_INSTALLATION_DIR
-  _WE_INSTALL_INTO=$(JAVA_INSTALLATION_DIR)
-endif
-
-internal-install-java-dirs:: $(_WE_INSTALL_INTO)
+internal-install-java-dirs:: $(JAVA_INSTALLATION_DIR)
 	if [ "$(JAVA_OBJ_FILES)" != "" ]; then \
-	  $(MKDIRS) $(addprefix $(_WE_INSTALL_INTO)/,$(dir $(JAVA_OBJ_FILES))); \
+	  $(MKDIRS) $(addprefix $(JAVA_INSTALLATION_DIR)/,$(dir $(JAVA_OBJ_FILES))); \
 	fi
 
-$(_WE_INSTALL_INTO):
-	$(MKDIRS) $(_WE_INSTALL_INTO)
+$(JAVA_INSTALLATION_DIR):
+	$(MKDIRS) $(JAVA_INSTALLATION_DIR)
 
 # Say that you have a Pisa.java source file.  Here we install both
 # Pisa.class (the main class) and also, if they exist, all class files
@@ -149,14 +130,14 @@ install-java_package:: internal-install-java-dirs
 	if [ "$(JAVA_OBJ_FILES)" != "" ]; then \
 	  for file in $(JAVA_OBJ_FILES) __done; do \
 	    if [ $$file != __done ]; then \
-	      $(INSTALL_DATA) $$file $(_WE_INSTALL_INTO)/$$file ; \
+	      $(INSTALL_DATA) $$file $(JAVA_INSTALLATION_DIR)/$$file ; \
 	    fi; \
 	  done; \
 	fi; \
 	if [ "$(ADDITIONAL_JAVA_OBJ_FILES)" != "" ]; then \
 	  for file in $(ADDITIONAL_JAVA_OBJ_FILES) __done; do \
 	    if [ $$file != __done ]; then \
-	      $(INSTALL_DATA) $$file $(_WE_INSTALL_INTO)/$$file ; \
+	      $(INSTALL_DATA) $$file $(JAVA_INSTALLATION_DIR)/$$file ; \
 	    fi;    \
 	  done;    \
 	fi