bump version to 1.5-2

[vncterm.git] / Makefile

diff --git a/Makefile b/Makefile
index ecf6b438e34086ce367884f6548fc8cb968d8950..6c9df5c580b50915c566e5a23e0e3d2f13c38bea 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 PACKAGE=vncterm
 # Note: also change version in debian/control and debian/changelog
-VERSION=1.4
+VERSION=1.5
 PACKAGERELEASE=2
 ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)
@@ -25,13 +25,14 @@ genfont2: genfont2.c
        gcc -g -O2 -o $@ genfont2.c -Wall -Wextra -D_GNU_SOURCE -lz
 
 .PHONY: vnc
-${VNCLIB} vnc: ${VNCSRC}
+vnc: ${VNCLIB}
+${VNCLIB}: ${VNCSRC}
        rm -rf ${VNCDIR}
        tar xf ${VNCSRC}
        ln -s ../vncpatches ${VNCDIR}/patches
        cd ${VNCDIR}; quilt push -a
        cd ${VNCDIR}; ./autogen.sh --without-ssl --without-websockets --without-tightvnc-filetransfer;
-       cd ${VNCDIR}; make
+       cd ${VNCDIR}; $(MAKE)
 
 vncterm: vncterm.c ${VNCLIB} wchardata.c
        gcc -O2 -g -o $@ vncterm.c wchardata.c -Wall -Wno-deprecated-declarations -D_GNU_SOURCE -I ${VNCDIR} ${VNCLIB} -lnsl -lpthread -lz -ljpeg -lutil -lgnutls -lpng
@@ -61,7 +62,7 @@ vncterm.1: vncterm.pod
 .PHONY: deb
 deb: $(DEB)
 ${DEB}:
-       make clean
+       $(MAKE) clean
        rsync -a . --exclude build build
        echo "Architecture: ${ARCH}" >> build/debian/control
        echo "git clone git://git.proxmox.com/git/vncterm.git\\ngit checkout ${GIVERSION}" > build/debian/SOURCE