Upstream-Status: Inappropriate [configuration]

Date: Jan 31, 2011

There are two fixes:
  1. -native needs to customize prefix
  2. needs to change python reference in binaries

Upstream-Status: Inappropriate [native]

Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

Index: createrepo-0.9.9/Makefile
===================================================================
--- createrepo-0.9.9.orig/Makefile	2011-01-26 09:14:30.000000000 -0800
+++ createrepo-0.9.9/Makefile	2011-04-06 14:12:06.608923997 -0700
@@ -10,22 +10,22 @@
 SHELL = /bin/sh
 top_srcdir = .
 srcdir = .
-prefix = /usr
-exec_prefix = ${prefix}
+prefix ?= /usr
+exec_prefix ?= ${prefix}
 
-bindir = ${exec_prefix}/bin
-sbindir = ${exec_prefix}/sbin
-libexecdir = ${exec_prefix}/libexec
-datadir = ${prefix}/share
-sysconfdir = ${prefix}/etc
-sharedstatedir = ${prefix}/com
-localstatedir = ${prefix}/var
-libdir = ${exec_prefix}/lib
-infodir = ${prefix}/info
+bindir ?= ${exec_prefix}/bin
+sbindir ?= ${exec_prefix}/sbin
+libexecdir ?= ${exec_prefix}/libexec
+datadir ?= ${prefix}/share
+sysconfdir ?= ${prefix}/etc
+sharedstatedir ?= ${prefix}/com
+localstatedir ?= ${prefix}/var
+libdir ?= ${exec_prefix}/lib
+infodir ?= ${prefix}/info
 docdir = 
-includedir = ${prefix}/include
+includedir ?= ${prefix}/include
 oldincludedir = /usr/include
-mandir = ${prefix}/share/man
+mandir ?= ${prefix}/share/man
 
 pkgdatadir = $(datadir)/$(PKGNAME)
 pkglibdir = $(libdir)/$(PKGNAME)
Index: createrepo-0.9.9/bin/Makefile
===================================================================
--- createrepo-0.9.9.orig/bin/Makefile	2011-01-26 09:14:30.000000000 -0800
+++ createrepo-0.9.9/bin/Makefile	2011-04-06 14:15:07.212923998 -0700
@@ -1,22 +1,22 @@
 SHELL = /bin/sh
 top_srcdir = ..
 srcdir = ../bin
-prefix = /usr
-exec_prefix = ${prefix}
+prefix ?= /usr
+exec_prefix ?= ${prefix}
 
-bindir = ${exec_prefix}/bin
-sbindir = ${exec_prefix}/sbin
-libexecdir = ${exec_prefix}/libexec
-datadir = ${prefix}/share
-sysconfdir = ${prefix}/etc
-sharedstatedir = ${prefix}/com
-localstatedir = ${prefix}/var
-libdir = ${exec_prefix}/lib
-infodir = ${prefix}/info
+bindir ?= ${exec_prefix}/bin
+sbindir ?= ${exec_prefix}/sbin
+libexecdir ?= ${exec_prefix}/libexec
+datadir ?= ${prefix}/share
+sysconfdir ?= ${prefix}/etc
+sharedstatedir ?= ${prefix}/com
+localstatedir ?= ${prefix}/var
+libdir ?= ${exec_prefix}/lib
+infodir ?= ${prefix}/info
 docdir = 
-includedir = ${prefix}/include
+includedir ?= ${prefix}/include
 oldincludedir = /usr/include
-mandir = ${prefix}/man
+mandir ?= ${prefix}/man
 
 pkgdatadir = $(datadir)/$(PKGNAME)
 pkglibdir = $(libdir)/$(PKGNAME)
@@ -41,9 +41,14 @@
 
 
 install: all installdirs
-	$(INSTALL_BIN) $(srcdir)/$(PKGNAME) $(DESTDIR)$(bindir)/$(PKGNAME)
-	$(INSTALL_BIN) $(srcdir)/modifyrepo $(DESTDIR)$(bindir)/modifyrepo
-	$(INSTALL_BIN) $(srcdir)/mergerepo $(DESTDIR)$(bindir)/mergerepo
+	sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/$(PACKAGE) > $(srcdir)/$(PACKAGE).tmp
+	sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/modifyrepo > $(srcdir)/modifyrepo.tmp
+	sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/mergerepo > $(srcdir)/mergerepo.tmp
+	$(INSTALL_BIN) $(srcdir)/$(PACKAGE).tmp $(DESTDIR)$(bindir)/$(PACKAGE)
+	$(INSTALL_BIN) $(srcdir)/modifyrepo.tmp $(DESTDIR)$(bindir)/modifyrepo
+	$(INSTALL_BIN) $(srcdir)/mergerepo.tmp $(DESTDIR)$(bindir)/mergerepo
+	rm -f $(srcdir)/$(PACKAGE).tmp $(srcdir)/modifyrepo.tmp $(srcdir)/mergerepo.tmp
+
 
 
 uninstall:
Index: createrepo-0.9.9/bin/createrepo
===================================================================
--- createrepo-0.9.9.orig/bin/createrepo	2011-01-26 09:14:30.000000000 -0800
+++ createrepo-0.9.9/bin/createrepo	2011-04-06 14:12:06.608923997 -0700
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec /usr/share/createrepo/genpkgmetadata.py "$@"
+exec @DATADIR@/createrepo/genpkgmetadata.py "$@"
Index: createrepo-0.9.9/bin/modifyrepo
===================================================================
--- createrepo-0.9.9.orig/bin/modifyrepo	2011-01-26 09:14:30.000000000 -0800
+++ createrepo-0.9.9/bin/modifyrepo	2011-04-06 14:12:06.608923997 -0700
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec /usr/share/createrepo/modifyrepo.py "$@"
+exec @DATADIR@/createrepo/modifyrepo.py "$@"
Index: createrepo-0.9.9/docs/Makefile
===================================================================
--- createrepo-0.9.9.orig/docs/Makefile	2011-01-26 09:14:30.000000000 -0800
+++ createrepo-0.9.9/docs/Makefile	2011-04-06 14:12:06.608923997 -0700
@@ -1,22 +1,22 @@
 SHELL = /bin/sh
 top_srcdir = ..
 srcdir = ../docs
-prefix = /usr
-exec_prefix = ${prefix}
+prefix ?= /usr
+exec_prefix ?= ${prefix}
 
-bindir = ${exec_prefix}/bin
-sbindir = ${exec_prefix}/sbin
-libexecdir = ${exec_prefix}/libexec
-datadir = ${prefix}/share
-sysconfdir = ${prefix}/etc
-sharedstatedir = ${prefix}/com
-localstatedir = ${prefix}/var
-libdir = ${exec_prefix}/lib
-infodir = ${prefix}/info
+bindir ?= ${exec_prefix}/bin
+sbindir ?= ${exec_prefix}/sbin
+libexecdir ?= ${exec_prefix}/libexec
+datadir ?= ${prefix}/share
+sysconfdir ?= ${prefix}/etc
+sharedstatedir ?= ${prefix}/com
+localstatedir ?= ${prefix}/var
+libdir ?= ${exec_prefix}/lib
+infodir ?= ${prefix}/info
 docdir = 
-includedir = ${prefix}/include
+includedir ?= ${prefix}/include
 oldincludedir = /usr/include
-mandir = ${datadir}/man
+mandir ?= ${datadir}/man
 
 pkgdatadir = $(datadir)/$(PKGNAME)
 pkglibdir = $(libdir)/$(PKGNAME)