diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-10-16 20:10:34 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-10-16 20:10:34 +0200 |
| commit | 94c0a7374ee0c980a34e134f93dca1d46e7af7bc (patch) | |
| tree | 134e5415fb5d2ccc613bdab46c97f5fa3df8c730 /package/nfs-utils/patches/patch-tools_Makefile_in | |
| parent | 07c250a84c1cc9ace9ebf00800f2125461a2662b (diff) | |
| parent | 084c175e59e9ea61c68154ad9982adcd918cbfcf (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/freeradius-server/Makefile
package/nss/patches/patch-mozilla_security_coreconf_Linux_mk
Diffstat (limited to 'package/nfs-utils/patches/patch-tools_Makefile_in')
| -rw-r--r-- | package/nfs-utils/patches/patch-tools_Makefile_in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/nfs-utils/patches/patch-tools_Makefile_in b/package/nfs-utils/patches/patch-tools_Makefile_in index a97226111..51581c14a 100644 --- a/package/nfs-utils/patches/patch-tools_Makefile_in +++ b/package/nfs-utils/patches/patch-tools_Makefile_in @@ -1,19 +1,19 @@ ---- nfs-utils-1.2.1.orig/tools/Makefile.in 2009-11-04 12:15:52.000000000 +0100 -+++ nfs-utils-1.2.1/tools/Makefile.in 2009-12-25 19:25:33.000000000 +0100 -@@ -71,7 +71,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE +--- nfs-utils-1.2.3.orig/tools/Makefile.in 2010-09-28 14:32:32.000000000 +0200 ++++ nfs-utils-1.2.3/tools/Makefile.in 2010-10-10 13:37:18.000000000 +0200 +@@ -77,7 +77,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE distdir ETAGS = etags CTAGS = ctags --DIST_SUBDIRS = locktest rpcdebug nlmtest rpcgen +-DIST_SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat rpcgen +DIST_SUBDIRS = rpcgen DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ -@@ -257,7 +257,7 @@ top_build_prefix = @top_build_prefix@ +@@ -266,7 +266,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ OPTDIRS = $(am__append_1) --SUBDIRS = locktest rpcdebug nlmtest $(OPTDIRS) +-SUBDIRS = locktest rpcdebug nlmtest mountstats nfs-iostat $(OPTDIRS) +SUBDIRS = $(OPTDIRS) MAINTAINERCLEANFILES = Makefile.in all: all-recursive |