From 5116f9e2d57d83fa1231215ada40841220a3ebf8 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 11 Jun 2015 08:28:47 +0000 Subject: [PATCH] defs.mk.in: Define RPM, RPM_ARCH and RPM_SUFFIX Move RPM, RPM_ARCH and RPM_SUFFIX definitions from rpmdist.mk to defs.mk.in. Signed-off-by: Jan Lindemann --- make/defs.mk | 14 ++++++++++---- make/rpmdist.mk | 10 ---------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index a977c758..35a84ace 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -51,6 +51,16 @@ else PKG_FORMAT ?= rpm endif +ifeq ($(PKG_FORMAT),debian) + RPM ?= /bin/bash $(MOD_SCRIPT_DIR)/dpm.sh + RPM_ARCH ?= $(shell dpkg --print-architecture) + RPM_SUFFIX ?= deb +else + RPM ?= /bin/rpm + RPM_ARCH ?= $(ARCH) + RPM_SUFFIX ?= rpm +endif + ifeq ($(PKG_FORMAT),debian) export INCLUDE_REV_IN_VERSIONS = true endif @@ -1746,10 +1756,6 @@ ifeq ($(USE_GLIB),true) endif endif -ifeq ($(USE_WT),true) -LIBFLAGS += -L$(WT_JANNET_DIR)/lib -lwt-jannet -lwt -lwthttp -lwtfcgi -endif - BUILD_CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(INCLUDE) BUILD_CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(INCLUDE) BUILD_LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS) diff --git a/make/rpmdist.mk b/make/rpmdist.mk index e25c0259..e0a9ca6a 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -4,16 +4,6 @@ CREATE_DEVEL = false endif endif -PKG_FORMAT ?= rpm -ifeq ($(PKG_FORMAT),debian) -RPM ?= /bin/bash $(MOD_SCRIPT_DIR)/dpm.sh -RPM_ARCH ?= $(shell dpkg --print-architecture) -RPM_SUFFIX ?= deb -else -RPM ?= /bin/rpm -RPM_ARCH ?= $(ARCH) -RPM_SUFFIX ?= rpm -endif CREATE_DEVEL ?= true UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh RPM_PROJECT ?= $(FLAVOUR_PREFIX)$(PROJECT)