diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-15 22:30:13 +0100 |
commit | c57d0300bd42fabd8eeda2a95b6c3960d6e7ce07 (patch) | |
tree | b53bc538246b5a900300b5c6b5ea740f978196f4 /package/tptest | |
parent | cf4b3959527339206254b8c8fc44deb391beeb10 (diff) | |
parent | 023560ac69a2ecf5659c668c26c0af6b5612a46b (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/nspr/Makefile
Diffstat (limited to 'package/tptest')
-rw-r--r-- | package/tptest/Makefile | 4 | ||||
-rw-r--r-- | package/tptest/patches/patch-apps_unix_client_Makefile | 4 | ||||
-rw-r--r-- | package/tptest/patches/patch-apps_unix_server_Makefile | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/package/tptest/Makefile b/package/tptest/Makefile index 3f6c0fc3c..436fce42c 100644 --- a/package/tptest/Makefile +++ b/package/tptest/Makefile @@ -16,6 +16,10 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,TPTEST,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +CONFIG_STYLE:= manual +BUILD_STYLE:= manual +INSTALL_STYLE:= manual + do-build: (cd ${WRKSRC}/apps/unix/server && ${MAKE} && ${MAKE} install DESTDIR="${WRKINST}") (cd ${WRKSRC}/apps/unix/client && ${MAKE} && ${MAKE} install DESTDIR="${WRKINST}") diff --git a/package/tptest/patches/patch-apps_unix_client_Makefile b/package/tptest/patches/patch-apps_unix_client_Makefile index 239d4770e..4043f3ec2 100644 --- a/package/tptest/patches/patch-apps_unix_client_Makefile +++ b/package/tptest/patches/patch-apps_unix_client_Makefile @@ -4,7 +4,7 @@ - drop the local subdir (openadk doesnt use this path) - create the directories to install into --- tptest-3.1.7.orig/apps/unix/client/Makefile 2004-04-07 15:22:56.000000000 +0200 -+++ tptest-3.1.7/apps/unix/client/Makefile 2010-01-20 12:01:14.267178336 +0100 ++++ tptest-3.1.7/apps/unix/client/Makefile 2010-01-28 00:00:45.000000000 +0100 @@ -1,4 +1,4 @@ -CC = gcc +CC ?= gcc @@ -28,7 +28,7 @@ install: - install -c -s -o bin -g bin -m 555 tptestclient /usr/local/bin + install -d -m 755 ${DESTDIR}/usr/bin -+ install -c -s -m 555 tptestclient ${DESTDIR}/usr/bin ++ install -c -m 755 tptestclient ${DESTDIR}/usr/bin depend: ${MAKEDEPEND} ${INCL} ${SRCS} ${LIBSRCS} diff --git a/package/tptest/patches/patch-apps_unix_server_Makefile b/package/tptest/patches/patch-apps_unix_server_Makefile index e4ea1eab8..127bd0a72 100644 --- a/package/tptest/patches/patch-apps_unix_server_Makefile +++ b/package/tptest/patches/patch-apps_unix_server_Makefile @@ -4,7 +4,7 @@ - drop the local subdir (openadk doesnt use this path) - create the directories to install into --- tptest-3.1.7.orig/apps/unix/server/Makefile 2003-01-22 11:42:45.000000000 +0100 -+++ tptest-3.1.7/apps/unix/server/Makefile 2010-01-20 12:01:24.758178270 +0100 ++++ tptest-3.1.7/apps/unix/server/Makefile 2010-01-28 00:00:23.000000000 +0100 @@ -1,4 +1,4 @@ -CC = gcc +CC ?= gcc @@ -28,7 +28,7 @@ install: - install -c -s -o bin -g bin -m 555 tptestserver /usr/local/bin + install -d -m 755 ${DESTDIR}/usr/bin -+ install -c -s -m 555 tptestserver ${DESTDIR}/usr/bin ++ install -c -m 755 tptestserver ${DESTDIR}/usr/bin depend: ${MAKEDEPEND} ${INCL} ${SRCS} ${LIBSRCS} |