recipes/proftpd/files/make.patch

   1 Index: proftpd-1.3.2/Makefile.in
   2 ===================================================================
   3 --- proftpd-1.3.2.orig/Makefile.in
   4 +++ proftpd-1.3.2/Makefile.in
   5 @@ -76,7 +76,6 @@ check: proftpd$(EXEEXT)
   6  $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(rundir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8:
   7         @if [ ! -d $@ ]; then \
   8                 mkdir -p $@; \
   9 -               chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \
  10                 chmod 0755 $@; \
  11         fi
  12
  13 @@ -86,7 +85,6 @@ install-proftpd: proftpd $(DESTDIR)$(inc
  14                 rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \
  15         fi
  16         ln -s proftpd $(DESTDIR)$(sbindir)/in.proftpd
  17 -       -chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd
  18
  19  install-libs: $(DESTDIR)$(libdir)/proftpd
  20         cd lib/ && $(MAKE) install
  21 @@ -121,11 +119,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DE
  22         $(INSTALL_SBIN) ftpshut  $(DESTDIR)$(sbindir)/ftpshut
  23         $(INSTALL_BIN)  ftptop   $(DESTDIR)$(bindir)/ftptop
  24         $(INSTALL_BIN)  ftpwho   $(DESTDIR)$(bindir)/ftpwho
  25 -       $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs
  26 +       $(INSTALL) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs
  27
  28  install-conf: $(DESTDIR)$(sysconfdir)
  29         if [ ! -f $(DESTDIR)$(sysconfdir)/proftpd.conf ] ; then \
  30 -               $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 \
  31 +               $(INSTALL) -m 0644 \
  32                            $(top_srcdir)/sample-configurations/basic.conf \
  33                            $(DESTDIR)$(sysconfdir)/proftpd.conf ; \
  34         fi
  35 Index: proftpd-1.3.2/Make.rules.in
  36 ===================================================================
  37 --- proftpd-1.3.2.orig/Make.rules.in
  38 +++ proftpd-1.3.2/Make.rules.in
  39 @@ -29,9 +29,9 @@ UTILS_LIBS=@UTILS_LIBS@ @LIBS@
  40  INSTALL=@INSTALL@
  41  INSTALL_USER=@install_user@
  42  INSTALL_GROUP=@install_group@
  43 -INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
  44 -INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
  45 -INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644
  46 +INSTALL_BIN=$(INSTALL) -m 0755
  47 +INSTALL_SBIN=$(INSTALL) -m 0755
  48 +INSTALL_MAN=$(INSTALL) -m 0644
  49
  50  RM=rm -f
  51  SHELL=/bin/sh
  52 Index: proftpd-1.3.2/lib/libcap/Makefile
  53 ===================================================================
  54 --- proftpd-1.3.2.orig/lib/libcap/Makefile
  55 +++ proftpd-1.3.2/lib/libcap/Makefile
  56 @@ -26,7 +26,7 @@ OBJS=$(addsuffix .o, $(FILES))
  57  all: $(LIBNAME)
  58
  59  _makenames: _makenames.c cap_names.sed
  60 -       $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@
  61 +       $(BUILD_CC) $(CFLAGS) $(LDFLAGS) $< -o $@
  62
  63  cap_names.h: _makenames
  64         ./_makenames > cap_names.h