Index: proftpd-1.3.2/Makefile.in =================================================================== --- proftpd-1.3.2.orig/Makefile.in +++ proftpd-1.3.2/Makefile.in @@ -76,7 +76,6 @@ check: proftpd$(EXEEXT) $(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: @if [ ! -d $@ ]; then \ mkdir -p $@; \ - chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \ chmod 0755 $@; \ fi @@ -86,7 +85,6 @@ install-proftpd: proftpd $(DESTDIR)$(inc rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \ fi ln -s proftpd $(DESTDIR)$(sbindir)/in.proftpd - -chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd install-libs: $(DESTDIR)$(libdir)/proftpd cd lib/ && $(MAKE) install @@ -121,11 +119,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DE $(INSTALL_SBIN) ftpshut $(DESTDIR)$(sbindir)/ftpshut $(INSTALL_BIN) ftptop $(DESTDIR)$(bindir)/ftptop $(INSTALL_BIN) ftpwho $(DESTDIR)$(bindir)/ftpwho - $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs + $(INSTALL) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs install-conf: $(DESTDIR)$(sysconfdir) if [ ! -f $(DESTDIR)$(sysconfdir)/proftpd.conf ] ; then \ - $(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 \ + $(INSTALL) -m 0644 \ $(top_srcdir)/sample-configurations/basic.conf \ $(DESTDIR)$(sysconfdir)/proftpd.conf ; \ fi Index: proftpd-1.3.2/Make.rules.in =================================================================== --- proftpd-1.3.2.orig/Make.rules.in +++ proftpd-1.3.2/Make.rules.in @@ -29,9 +29,9 @@ UTILS_LIBS=@UTILS_LIBS@ @LIBS@ INSTALL=@INSTALL@ INSTALL_USER=@install_user@ INSTALL_GROUP=@install_group@ -INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 -INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 -INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 +INSTALL_BIN=$(INSTALL) -m 0755 +INSTALL_SBIN=$(INSTALL) -m 0755 +INSTALL_MAN=$(INSTALL) -m 0644 RM=rm -f SHELL=/bin/sh Index: proftpd-1.3.2/lib/libcap/Makefile =================================================================== --- proftpd-1.3.2.orig/lib/libcap/Makefile +++ proftpd-1.3.2/lib/libcap/Makefile @@ -26,7 +26,7 @@ OBJS=$(addsuffix .o, $(FILES)) all: $(LIBNAME) _makenames: _makenames.c cap_names.sed - $(CC) $(CFLAGS) $(LDFLAGS) $< -o $@ + $(BUILD_CC) $(CFLAGS) $(LDFLAGS) $< -o $@ cap_names.h: _makenames ./_makenames > cap_names.h