From e1001f67442ee4fedb949871e42f1f08ee7f08ec Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@jannet.de>
Date: Sat, 20 Jul 2002 18:20:01 +0000
Subject: [PATCH] cfg_dev.mk, ytools.mk.in: Move ftp upload data into ytools.mk

---
 make/cfg_dev.mk   | 12 ------------
 make/ytools.mk.in | 16 ++++++++++++++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/make/cfg_dev.mk b/make/cfg_dev.mk
index d854d192..3b627af3 100644
--- a/make/cfg_dev.mk
+++ b/make/cfg_dev.mk
@@ -41,18 +41,6 @@ CONFIG_FILE      = $(CONFIG_DIR)/$(PROJECT).cfg
 LIBTYPE          = static
 FTP_PUB_DIR_ABS  = $(JANNET_PROJ_DIR)/$(PROJECT)
 
-# rpmdist.mk variables
-MKSPEC_SH        = $(TOPDIR)/make/mkspec.sh
-FTP_SRC_GROUP    = ytsrc
-FTP_SRC_USER     = jan
-FTP_RUN_GROUP    = ytrun
-FTP_RUN_USER     = jan
-FTP_DEV_GROUP    = ytdev
-FTP_DEV_USER     = jan
-FTP_HOST         = ftp.jannet.de
-#FTP_HOST         = ftp.jannet.de
-FTP_HOST_LOGIN   = root
-
 # -- debugging options
 
 # for using the dbmalloc lib, before you will need to do:
diff --git a/make/ytools.mk.in b/make/ytools.mk.in
index 78564faa..7b363f29 100644
--- a/make/ytools.mk.in
+++ b/make/ytools.mk.in
@@ -24,10 +24,22 @@ REQUIRED = inst/pre \
 		lib include bin \
 		inst/post
 
-VERSION                = @PACKAGE_VERSION@
-VERSION_STR            = \"@PACKAGE_VERSION@\"
+VERSION     = @PACKAGE_VERSION@
+VERSION_STR = \"@PACKAGE_VERSION@\"
 DEVELOPMENT = @IS_DEVELOPMENT_VERSION@
 
+# rpmdist.mk variables
+MKSPEC_SH        = $(TOPDIR)/make/mkspec.sh
+FTP_SRC_GROUP    = ytsrc
+FTP_SRC_USER     = jan
+FTP_RUN_GROUP    = ytrun
+FTP_RUN_USER     = jan
+FTP_DEV_GROUP    = ytdev
+FTP_DEV_USER     = jan
+FTP_HOST         = ftp.jannet.de
+#FTP_HOST         = ftp.jannet.de
+FTP_HOST_LOGIN   = root
+
 ifeq ($(DEVELOPMENT),true)
 	include $(TOPDIR)/make/cfg_dev.mk
 else