diff options
Diffstat (limited to 'meta-networking/recipes-daemons/proftpd/files/build_fixup.patch')
-rw-r--r-- | meta-networking/recipes-daemons/proftpd/files/build_fixup.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch b/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch index 8126b3619a..2b01d3a682 100644 --- a/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch +++ b/meta-networking/recipes-daemons/proftpd/files/build_fixup.patch | |||
@@ -30,7 +30,7 @@ diff --git a/Makefile.in b/Makefile.in | |||
30 | index 9434cbd..13f2e16 100644 | 30 | index 9434cbd..13f2e16 100644 |
31 | --- a/Makefile.in | 31 | --- a/Makefile.in |
32 | +++ b/Makefile.in | 32 | +++ b/Makefile.in |
33 | @@ -123,7 +123,6 @@ check: proftpd$(EXEEXT) | 33 | @@ -129,7 +129,6 @@ check: proftpd$(EXEEXT) |
34 | $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8: | 34 | $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8: |
35 | @if [ ! -d $@ ]; then \ | 35 | @if [ ! -d $@ ]; then \ |
36 | mkdir -p $@; \ | 36 | mkdir -p $@; \ |
@@ -38,18 +38,18 @@ index 9434cbd..13f2e16 100644 | |||
38 | chmod 0755 $@; \ | 38 | chmod 0755 $@; \ |
39 | fi | 39 | fi |
40 | 40 | ||
41 | @@ -133,7 +132,6 @@ install-proftpd: proftpd$(EXEEXT) $(DESTDIR)$(includedir) $(DESTDIR)$(localstate | 41 | @@ -139,7 +138,6 @@ install-proftpd: $(DESTDIR)$(includedir) $(DESTDIR)$(localstatedir) $(DESTDIR)$( |
42 | rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \ | 42 | rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \ |
43 | fi | 43 | fi |
44 | ln -s $(top_builddir)/proftpd $(DESTDIR)$(sbindir)/in.proftpd | 44 | ln -s $(top_builddir)/proftpd $(DESTDIR)$(sbindir)/in.proftpd |
45 | - -chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd | 45 | - -chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd |
46 | 46 | ||
47 | install-libs: $(DESTDIR)$(libdir)/proftpd | 47 | install-libs: $(DESTDIR)$(libdir)/proftpd |
48 | cd lib/ && $(MAKE) install | 48 | cd lib/ && $(MAKE) install |
49 | @@ -170,11 +168,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir) | 49 | @@ -177,11 +175,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir) |
50 | $(INSTALL_SBIN) $(top_builddir)/ftpshut $(DESTDIR)$(sbindir)/ftpshut | 50 | $(INSTALL_SBIN) $(top_builddir)/ftpshut $(DESTDIR)$(sbindir)/ftpshut |
51 | $(INSTALL_BIN) $(top_builddir)/ftptop $(DESTDIR)$(bindir)/ftptop | 51 | $(INSTALL_BIN) $(top_builddir)/ftptop $(DESTDIR)$(bindir)/ftptop |
52 | $(INSTALL_BIN) $(top_builddir)/ftpwho $(DESTDIR)$(bindir)/ftpwho | 52 | $(INSTALL_BIN) $(top_builddir)/ftpwho $(DESTDIR)$(bindir)/ftpwho |
53 | - $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs | 53 | - $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs |
54 | + $(INSTALL) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs | 54 | + $(INSTALL) -m 0755 $(top_builddir)/src/prxs $(DESTDIR)$(bindir)/prxs |
55 | 55 | ||
@@ -64,7 +64,7 @@ diff --git a/configure b/configure | |||
64 | index 0a51670..69fa130 100755 | 64 | index 0a51670..69fa130 100755 |
65 | --- a/configure | 65 | --- a/configure |
66 | +++ b/configure | 66 | +++ b/configure |
67 | @@ -25116,7 +25116,7 @@ _ACEOF | 67 | @@ -25683,7 +25683,7 @@ _ACEOF |
68 | 68 | ||
69 | 69 | ||
70 | cat >>confdefs.h <<_ACEOF | 70 | cat >>confdefs.h <<_ACEOF |
@@ -73,7 +73,7 @@ index 0a51670..69fa130 100755 | |||
73 | _ACEOF | 73 | _ACEOF |
74 | 74 | ||
75 | 75 | ||
76 | @@ -25126,7 +25126,7 @@ _ACEOF | 76 | @@ -25693,7 +25693,7 @@ _ACEOF |
77 | 77 | ||
78 | 78 | ||
79 | cat >>confdefs.h <<_ACEOF | 79 | cat >>confdefs.h <<_ACEOF |
@@ -86,7 +86,7 @@ diff --git a/configure.in b/configure.in | |||
86 | index 50561de..93cad3f 100644 | 86 | index 50561de..93cad3f 100644 |
87 | --- a/configure.in | 87 | --- a/configure.in |
88 | +++ b/configure.in | 88 | +++ b/configure.in |
89 | @@ -4059,8 +4059,8 @@ locale_dir="`eval echo ${locale_dir}`" | 89 | @@ -4248,8 +4248,8 @@ locale_dir="`eval echo ${locale_dir}`" |
90 | AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`", [Define the locale directory]) | 90 | AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`", [Define the locale directory]) |
91 | 91 | ||
92 | AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`", [Define the run directory]) | 92 | AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`", [Define the run directory]) |