From d831fffd51e8766d6e834e10bf952df93718aa42 Mon Sep 17 00:00:00 2001
From: Nicola Pero <n.pero@mi.flashnet.it>
Date: Wed, 30 Jan 2002 19:51:21 +0000
Subject: [PATCH] Some minor variables for frameworks and bundles moved from
 rules.make to common.make

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@12307 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog   |  5 +++++
 common.make | 10 ++++++++++
 rules.make  | 18 +-----------------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 37d96d05..c97b8721 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 30 17:54:45 2002  Nicola Pero  <n.pero@mi.flashnet.it>
+
+	* rules.make (BUNDLE_EXTENSION, CURRENT_VERSION_NAME,
+	DEPLOY_WITH_CURRENT_VERSION): Moved to common.make.
+
 Wed Jan 30 17:53:03 2002  Nicola Pero  <n.pero@mi.flashnet.it>
 
 	* rules.make: Always include Instance/rules.make, even if in the
diff --git a/common.make b/common.make
index 80f6d5cb..d64d106c 100644
--- a/common.make
+++ b/common.make
@@ -460,6 +460,16 @@ ifeq ($(JAVADOC),)
   JAVADOC = $(JAVA_HOME)/bin/javadoc
 endif
 
+#
+# Common variables - default values
+#
+# Because this file is included at the beginning of the user's
+# GNUmakefile, the user can override these variables by setting them
+# in the GNUmakefile.
+BUNDLE_EXTENSION = .bundle
+CURRENT_VERSION_NAME = A
+DEPLOY_WITH_CURRENT_VERSION = yes
+
 # We want total control over GNUSTEP_MAKE_INSTANCE_INVOCATION.
 # GNUSTEP_MAKE_INSTANCE_INVOCATION determines wheter it's a Master or
 # an Instance invocation.  Whenever we run a submake, we want it to be
diff --git a/rules.make b/rules.make
index 5f2b4dfb..86d138a5 100644
--- a/rules.make
+++ b/rules.make
@@ -59,23 +59,7 @@ ifneq ($(INSTALL_AS_GROUP),)
 endif
 
 
-#
-# The bundle extension (default is .bundle) is defined by BUNDLE_EXTENSION.
-#
-ifeq ($(strip $(BUNDLE_EXTENSION)),)
-BUNDLE_EXTENSION = .bundle
-endif
-
-#
-# Common variables for frameworks
-#
-ifeq ($(CURRENT_VERSION_NAME),)
-  CURRENT_VERSION_NAME := A
-endif
-ifeq ($(DEPLOY_WITH_CURRENT_VERSION),)
-  DEPLOY_WITH_CURRENT_VERSION := yes
-endif
-
+# FIXME - what to do with these
 FRAMEWORK_NAME := $(strip $(FRAMEWORK_NAME))
 FRAMEWORK_DIR_NAME := $(FRAMEWORK_NAME:=.framework)
 FRAMEWORK_VERSION_DIR_NAME := $(FRAMEWORK_DIR_NAME)/Versions/$(CURRENT_VERSION_NAME)