diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/ltp/patches/patch-Makefile | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/ltp/patches/patch-Makefile')
| -rw-r--r-- | package/ltp/patches/patch-Makefile | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/package/ltp/patches/patch-Makefile b/package/ltp/patches/patch-Makefile deleted file mode 100644 index a7f4d050d..000000000 --- a/package/ltp/patches/patch-Makefile +++ /dev/null @@ -1,20 +0,0 @@ -$Id$ -Installation as root is never done anyway, so remove this crap ---- ltp-full-20061121.orig/Makefile 2006-11-21 21:31:20.000000000 +0100 -+++ ltp-full-20061121/Makefile 2006-12-06 12:08:02.000000000 +0100 -@@ -44,15 +44,10 @@ all: libltp.a - @$(MAKE) -C pan $@ - @$(MAKE) -C testcases $@ - @$(MAKE) -C tools $@ -- @echo -- @echo "***********************************************" -- @echo "** You now need to do a make install as root **" -- @echo "***********************************************" - - install: all - @$(MAKE) -C testcases install - @$(MAKE) -C tools install -- @./IDcheck.sh - - libltp.a: - @$(MAKE) -C lib $@ |