c1f565
diff --git a/include/builddefs.in b/include/builddefs.in
c1f565
index 6df0f5a..575a6df 100644
c1f565
--- a/include/builddefs.in
c1f565
+++ b/include/builddefs.in
c1f565
@@ -40,14 +40,14 @@ PKG_RELEASE	= @pkg_release@
c1f565
 PKG_VERSION	= @pkg_version@
c1f565
 PKG_PLATFORM	= @pkg_platform@
c1f565
 PKG_DISTRIBUTION= @pkg_distribution@
c1f565
-PKG_BIN_DIR	= @bindir@
c1f565
-PKG_SBIN_DIR	= @sbindir@
c1f565
-PKG_LIB_DIR	= @libdir@@libdirsuffix@
c1f565
-PKG_DEVLIB_DIR	= @libexecdir@@libdirsuffix@
c1f565
-PKG_INC_DIR	= @includedir@/attr
c1f565
-PKG_MAN_DIR	= @mandir@
c1f565
-PKG_DOC_DIR	= @datadir@/doc/@pkg_name@
c1f565
-PKG_LOCALE_DIR	= @datadir@/locale
c1f565
+PKG_BIN_DIR	= $(DESTDIR)@bindir@
c1f565
+PKG_SBIN_DIR	= $(DESTDIR)@sbindir@
c1f565
+PKG_LIB_DIR	= $(DESTDIR)@libdir@@libdirsuffix@
c1f565
+PKG_DEVLIB_DIR	= $(DESTDIR)@libexecdir@@libdirsuffix@
c1f565
+PKG_INC_DIR	= $(DESTDIR)@includedir@/attr
c1f565
+PKG_MAN_DIR	= $(DESTDIR)@mandir@
c1f565
+PKG_DOC_DIR	= $(DESTDIR)@datadir@/doc/@pkg_name@-@pkg_version@
c1f565
+PKG_LOCALE_DIR	= $(DESTDIR)@datadir@/locale
c1f565
 
c1f565
 CC		= @cc@
c1f565
 AWK		= @awk@
c1f565
diff --git a/include/buildmacros b/include/buildmacros
c1f565
index ab89182..3118a17 100644
c1f565
--- a/include/buildmacros
c1f565
+++ b/include/buildmacros
c1f565
@@ -40,7 +40,7 @@ OBJECTS = $(ASFILES:.s=.o) \
c1f565
 	  $(LFILES:.l=.o) \
c1f565
 	  $(YFILES:%.y=%.tab.o)
c1f565
 
c1f565
-INSTALL	= $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
c1f565
+INSTALL	= $(TOPDIR)/include/install-sh
c1f565
 
c1f565
 SHELL = /bin/sh
c1f565
 IMAGES_DIR = $(TOPDIR)/all-images