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

Makefile, defs-orig.mk: Some fixes concerning autoconf

Browse source
This commit is contained in:
Jan Lindemann 2002-07-20 17:16:06 +00:00 • committed by Jan Lindemann
commit a7120b5b50
2 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -1,3 +1,4 @@
TOPDIR=.
MODDIR=.
SUBDIRS = inst/pre \
@ -18,10 +19,11 @@ SUBDIRS = inst/pre \
lib include bin \
inst/post
ifneq ($(wildcard $(MODDIR)/make/defs.mk),)
include $(MODDIR)/make/defs.mk
ifneq ($(wildcard $(MODDIR)/make/ytools.mk),)
include $(MODDIR)/make/ytools.mk
endif
include $(MODDIR)/make/defs.mk
include $(MODDIR)/make/rules.mk
include $(MODDIR)/make/rpmdist.mk
include $(MODDIR)/make/autoconf.mk

13
make/defs-orig.mk
View file

@ -3,9 +3,10 @@
# contact@jannet.de
# $Id$
include $(MODDIR)/make/projdefs.mk
ifndef LIBNAME
LIBNAME := $(PROJECT)
endif
LIBNAME := $(PROJECT)
WINVERSION = $(shell echo $(VERSION) | sed -e "s/\./_/g")
LOCAL_VERSION = $(shell echo $(VERSION))
LOCAL_WINVERSION = $(shell echo $(VERSION) | sed -e "s/\./_/g")
@ -13,18 +14,12 @@ DIST_VERSION = $(shell echo $(VERSION) | sed -e "s/-dev//")
DIST_WINVERSION = $(shell echo $(WINVERSION) | sed -e "s/-dev//")
LOCAL_DIST_VERSION = $(shell echo $(LOCAL_VERSION) | sed -e "s/-dev//")
LOCAL_DIST_WINVERSION = $(shell echo $(LOCAL_WINVERSION) | sed -e "s/-dev//")
DEVELOPMENT = $(shell echo $(VERSION) | grep 'dev' >/dev/null && echo true)
#DEVELOPMENT = $(shell echo $(VERSION) | grep 'dev' >/dev/null && echo true)
PROJECT_STEM = $(PROJECT)-$(DIST_VERSION)
FTP_PCKG_DIR = /pub/packages
JANNET_PROJ_DIR = rsync_ssh://ftp.jannet.de:/usr/local/ftp$(FTP_PCKG_DIR)
ifeq ($(DEVELOPMENT),true)
include $(TOPDIR)/make/cfg_dev.mk
else
include $(TOPDIR)/make/cfg_dist.mk
endif
GCC_VERSION = $(shell gcc -v 2>&1 | grep version | awk '{ print $$3;}')
GCC_MAJOR = $(shell gcc -v 2>&1 | grep version | awk '{ split($$3,a,"."); print a[1];}')
GCC_MINOR = $(shell gcc -v 2>&1 | grep version | awk '{ split($$3,a,"."); print a[2];}')