janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 12:03:31 +01:00
Code Activity

defs.mk.in: Define RPM, RPM_ARCH and RPM_SUFFIX

Browse source 
Move RPM, RPM_ARCH and RPM_SUFFIX definitions from rpmdist.mk to
defs.mk.in.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2015-06-11 08:28:47 +00:00
commit 5116f9e2d5
2 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
make/defs.mk
View file

@ -51,6 +51,16 @@ else
PKG_FORMAT ?= rpm PKG_FORMAT ?= rpm
endif 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) ifeq ($(PKG_FORMAT),debian)
export INCLUDE_REV_IN_VERSIONS = true export INCLUDE_REV_IN_VERSIONS = true
endif endif
@ -1746,10 +1756,6 @@ ifeq ($(USE_GLIB),true)
endif endif
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_CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(INCLUDE)
BUILD_CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(INCLUDE) BUILD_CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(INCLUDE)
BUILD_LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS) BUILD_LDFLAGS += $(LOCAL_LDFLAGS) $(PROJECTLIB_LDFLAGS) $(PROJECT_LDFLAGS) $(LPPFLAGS) $(LIBFLAGS)

10
make/rpmdist.mk
View file

@ -4,16 +4,6 @@ CREATE_DEVEL = false
endif endif
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 CREATE_DEVEL ?= true
UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
RPM_PROJECT ?= $(FLAVOUR_PREFIX)$(PROJECT) RPM_PROJECT ?= $(FLAVOUR_PREFIX)$(PROJECT)