Sophie

Sophie

distrib > Mandriva > 2009.0 > i586 > by-pkgid > 0edc1ab5fa5058149211d8fea160d752 > files > 8

proftpd-1.3.2-0.4mdv2009.0.src.rpm

diff -Naur proftpd-1.3.2/Makefile.in proftpd-1.3.2.oden/Makefile.in
--- proftpd-1.3.2/Makefile.in	2008-11-19 04:51:38.000000000 +0100
+++ proftpd-1.3.2.oden/Makefile.in	2009-02-14 18:31:43.000000000 +0100
@@ -76,7 +76,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:
 	@if [ ! -d $@ ]; then \
 		mkdir -p $@; \
-		chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \
 		chmod 0755 $@; \
 	fi
 
@@ -86,7 +85,6 @@
 		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_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
diff -Naur proftpd-1.3.2/Make.rules.in proftpd-1.3.2.oden/Make.rules.in
--- proftpd-1.3.2/Make.rules.in	2008-11-19 04:51:38.000000000 +0100
+++ proftpd-1.3.2.oden/Make.rules.in	2009-02-14 18:31:43.000000000 +0100
@@ -27,11 +27,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