You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
69 lines
2.1 KiB
69 lines
2.1 KiB
Index: Makefile |
|
--- Makefile.orig 2014-02-11 22:06:01.000000000 +0100 |
|
+++ Makefile 2014-03-24 20:12:24.848041897 +0100 |
|
@@ -1,13 +1,13 @@ |
|
# Configuration |
|
|
|
VERSION=$(shell ./genver.sh -r) |
|
-USELIBCONFIG=1 # Use libconfig? (necessary to use configuration files) |
|
+USELIBCONFIG= # Use libconfig? (necessary to use configuration files) |
|
USELIBWRAP= # Use libwrap? |
|
USELIBCAP= # Use libcap? |
|
COV_TEST= # Perform test coverage? |
|
PREFIX=/usr/local |
|
|
|
-MAN=sslh.8.gz # man page name |
|
+MAN=sslh.8 # man page name |
|
|
|
# End of configuration -- the rest should take care of |
|
# itself |
|
@@ -18,6 +18,7 @@ |
|
|
|
CC ?= gcc |
|
CFLAGS ?=-Wall -g $(CFLAGS_COV) |
|
+LDFLAGS= |
|
|
|
LIBS= |
|
OBJS=common.o sslh-main.o probe.o |
|
@@ -59,7 +60,7 @@ |
|
$(CC) $(CFLAGS) $(LDFLAGS) -o echosrv echosrv.o probe.o common.o $(LIBS) |
|
|
|
$(MAN): sslh.pod Makefile |
|
- pod2man --section=8 --release=$(VERSION) --center=" " sslh.pod | gzip -9 - > $(MAN) |
|
+ pod2man --section=8 --release=$(VERSION) --center=" " sslh.pod > $(MAN) |
|
|
|
# Create release: export clean tree and tag current |
|
# configuration |
|
Index: genver.sh |
|
--- genver.sh.orig 2014-02-11 22:06:01.000000000 +0100 |
|
+++ genver.sh 2014-03-24 20:12:41.918208546 +0100 |
|
@@ -7,28 +7,7 @@ |
|
QUIET=0 |
|
fi |
|
|
|
-if ! `(git status | grep -q "On branch") 2> /dev/null`; then |
|
- # If we don't have git, we can't work out what |
|
- # version this is. It must have been downloaded as a |
|
- # zip file. Github creates the zip file with all |
|
- # files dated from the last change: use the |
|
- # Makefile's modification time as a release number |
|
- release=zip-`stat -c "%y" Makefile | sed 's/ .*//'` |
|
-fi |
|
- |
|
-if head=`git rev-parse --verify HEAD 2>/dev/null`; then |
|
- # generate the version info based on the tag |
|
- release=`(git describe --tags || git --describe || git describe --all --long) \ |
|
- 2>/dev/null | tr -d '\n'` |
|
- |
|
- # Are there uncommitted changes? |
|
- git update-index --refresh --unmerged > /dev/null |
|
- if git diff-index --name-only HEAD | grep -v "^scripts/package" \ |
|
- | read dummy; then |
|
- release="$release-dirty" |
|
- fi |
|
-fi |
|
- |
|
+release="1.6" |
|
|
|
if [ $QUIET -ne 1 ]; then |
|
printf "#ifndef _VERSION_H_ \n"
|
|
|