[SCM] client, protocol, and server for running Java programs from CLI branch, master, updated. debian/0.9.0+trunk95-3-18-gbcb445c

Hideki Yamane henrich at debian.org
Tue Jun 11 09:52:26 UTC 2013


The following commit has been merged in the master branch:
commit a3210f463f09b13cff460024a432f53d7da69b37
Author: Hideki Yamane <henrich at debian.org>
Date:   Tue Jun 11 18:06:54 2013 +0900

    remove install target from Makefile
    
    it specifies /usr/local/bin but we don't want it, use debian/install,
    instead.

diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..9e07376
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+ng-nailgun	usr/bin/
diff --git a/debian/patches/disable_install_target.patch b/debian/patches/disable_install_target.patch
new file mode 100644
index 0000000..5ec8661
--- /dev/null
+++ b/debian/patches/disable_install_target.patch
@@ -0,0 +1,14 @@
+Index: nailgun/Makefile
+===================================================================
+--- nailgun.orig/Makefile	2013-06-11 18:03:31.741051396 +0900
++++ nailgun/Makefile	2013-06-11 18:05:00.617323560 +0900
+@@ -13,9 +13,6 @@
+ 	@echo "Building ng client.  To build a Windows binary, type 'make ng.exe'"
+ 	${CC} $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o ng ${SRCDIR}/ng.c
+ 
+-install: ng
+-	install ng /usr/local/bin
+-	
+ ng.exe: ${SRCDIR}/ng.c
+ 	${WIN32_CC} -o ng.exe ${SRCDIR}/ng.c -lwsock32 -O3 ${CFLAGS}
+ # any idea why the command line is so sensitive to the order of
diff --git a/debian/patches/series b/debian/patches/series
index d8ae9dc..afe6f5c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 name_define_as_ng-nailgun_ng.c.patch
 Makefile_enable_hardening.patch
+disable_install_target.patch

-- 
client, protocol, and server for running Java programs from CLI



More information about the pkg-java-commits mailing list