mirror of
https://github.com/proxytunnel/proxytunnel.git
synced 2026-01-23 02:34:59 +00:00
Fixed revision info with or without .svn tree. Added rpm targets.
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@242 bc163920-b10d-0410-b2c5-a5491ca2ceef
This commit is contained in:
parent
44b989f966
commit
6b408ebd03
1 changed files with 16 additions and 5 deletions
21
Makefile
21
Makefile
|
|
@ -2,11 +2,19 @@
|
|||
#
|
||||
# Please uncomment the appropriate settings
|
||||
|
||||
name = proxytunnel
|
||||
version = $(shell awk 'BEGIN { FS="\"" } /^\#define VERSION / { print $$2 }' config.h)
|
||||
|
||||
ifneq ($(wildcard .svn),)
|
||||
revision = $(shell svnversion | awk 'BEGIN { RS=":" } { next } END { print $$1 }')
|
||||
else
|
||||
revision = $(shell echo '$$Revision$$' | sed -e 's/\$$Revision: \([0-9]\+\) \$$$$/\1/')
|
||||
endif
|
||||
|
||||
CC ?= cc
|
||||
CFLAGS ?= -Wall -O2 -ggdb
|
||||
|
||||
#OPTFLAGS = -DREVISION=\"$(shell svnversion | awk 'BEGIN { RS=":" } { next } END { print $$1 }')\"
|
||||
OPTFLAGS = -DREVISION=\"$(shell echo '$$Revision$$' | sed -e 's/\$$Revision: \([0-9]\+\)\$$$$/\1/')\"
|
||||
OPTFLAGS = -DREVISION=\"$(revision)\"
|
||||
|
||||
# Comment on non-gnu systems
|
||||
OPTFLAGS += -DHAVE_GETOPT_LONG
|
||||
|
|
@ -47,9 +55,6 @@ SSL_LIBS := -lssl -lcrypto
|
|||
endif
|
||||
LDFLAGS += $(SSL_LIBS)
|
||||
|
||||
name = proxytunnel
|
||||
version = $(shell awk 'BEGIN { FS="\"" } /^\#define VERSION / { print $$2 }' config.h)
|
||||
|
||||
prefix = /usr/local
|
||||
bindir = $(prefix)/bin
|
||||
datadir = $(prefix)/share
|
||||
|
|
@ -95,3 +100,9 @@ install:
|
|||
dist: clean docs
|
||||
sed -i -e 's/^Version:.*$$/Version: $(version)/' contrib/proxytunnel.spec
|
||||
find . ! -wholename '*/.svn*' | pax -d -w -x ustar -s ,^./,$(name)-$(version)/, | bzip2 >../$(name)-$(version).tar.bz2
|
||||
|
||||
rpm: dist
|
||||
rpmbuild -tb --clean --rmsource --rmspec --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_rpmdir ../" ../$(name)-$(version).tar.bz2
|
||||
|
||||
srpm: dist
|
||||
rpmbuild -ts --clean --rmsource --rmspec --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" --define "_srcrpmdir ../" ../$(name)-$(version).tar.bz2
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue