fix install location

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@37793 d073be05-634f-4543-b044-5fe20cf6d1d6
macports · Jun 23, 2008 · 84077f9 · 84077f9
1 parent 26fc287
commit 84077f9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/sysutils/moreutils/Portfile b/sysutils/moreutils/Portfile
@@ -38,8 +38,7 @@ pre-build   {
         ${worksrcpath}/ts ${worksrcpath}/combine \
         ${worksrcpath}/zrun
         reinplace "s|docbook2x-man|docbook2man|" ${worksrcpath}/Makefile
-        }
-destroot.env    PREFIX=${destroot}${prefix}
+}
 
 variant doc description {Install man pages} {
         depends_build-append    port:docbook-xml-4.4 port:docbook2X

diff --git a/sysutils/moreutils/files/patch-Makefile.diff b/sysutils/moreutils/files/patch-Makefile.diff
@@ -23,15 +23,15 @@
 -	mkdir -p $(DESTDIR)/usr/bin
 -	$(INSTALL_BIN) $(BINS) $(DESTDIR)/usr/bin
 -	install $(PERLSCRIPTS) $(DESTDIR)/usr/bin
-+	mkdir -p $(DESTDIR)/bin
-+	$(INSTALL_BIN) $(BINS) $(DESTDIR)/bin
-+	install $(PERLSCRIPTS) $(DESTDIR)/bin
++	mkdir -p $(DESTDIR)/$(PREFIX)/bin
++	$(INSTALL_BIN) $(BINS) $(DESTDIR)/$(PREFIX)/bin
++	install $(PERLSCRIPTS) $(DESTDIR)/$(PREFIX)/bin
 
 -	mkdir -p $(DESTDIR)/usr/share/man/man1
 -	install $(MANS) $(DESTDIR)/usr/share/man/man1
 +install-doc:
-+	mkdir -p $(DESTDIR)/share/man/man1
-+	install $(MANS) $(DESTDIR)/share/man/man1
++	mkdir -p $(DESTDIR)/$(PREFIX)/share/man/man1
++	install $(MANS) $(DESTDIR)/$(PREFIX)/share/man/man1
 
  check: isutf8
  	./check-isutf8