Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Inappropriate [configuration] |
| 2 | |
| 3 | Date: Jan 31, 2011 |
| 4 | |
| 5 | There are two fixes: |
| 6 | 1. -native needs to customize prefix |
| 7 | 2. needs to change python reference in binaries |
| 8 | |
| 9 | Signed-off-by: Qing He <qing.he@intel.com> |
| 10 | |
| 11 | diff --git a/Makefile b/Makefile |
| 12 | index b2d1a32..3c3639f 100644 |
| 13 | --- a/Makefile |
| 14 | +++ b/Makefile |
| 15 | @@ -3,22 +3,22 @@ VERSION = 0.4.11 |
| 16 | SHELL = /bin/sh |
| 17 | top_srcdir = . |
| 18 | srcdir = . |
| 19 | -prefix = /usr |
| 20 | -exec_prefix = ${prefix} |
| 21 | - |
| 22 | -bindir = ${exec_prefix}/bin |
| 23 | -sbindir = ${exec_prefix}/sbin |
| 24 | -libexecdir = ${exec_prefix}/libexec |
| 25 | -datadir = ${prefix}/share |
| 26 | -sysconfdir = ${prefix}/etc |
| 27 | -sharedstatedir = ${prefix}/com |
| 28 | -localstatedir = ${prefix}/var |
| 29 | -libdir = ${exec_prefix}/lib |
| 30 | -infodir = ${prefix}/info |
| 31 | +prefix ?= /usr |
| 32 | +exec_prefix ?= ${prefix} |
| 33 | + |
| 34 | +bindir ?= ${exec_prefix}/bin |
| 35 | +sbindir ?= ${exec_prefix}/sbin |
| 36 | +libexecdir ?= ${exec_prefix}/libexec |
| 37 | +datadir ?= ${prefix}/share |
| 38 | +sysconfdir ?= ${prefix}/etc |
| 39 | +sharedstatedir ?= ${prefix}/com |
| 40 | +localstatedir ?= ${prefix}/var |
| 41 | +libdir ?= ${exec_prefix}/lib |
| 42 | +infodir ?= ${prefix}/info |
| 43 | docdir = |
| 44 | -includedir = ${prefix}/include |
| 45 | +includedir ?= ${prefix}/include |
| 46 | oldincludedir = /usr/include |
| 47 | -mandir = ${prefix}/share/man |
| 48 | +mandir ?= ${prefix}/share/man |
| 49 | |
| 50 | pkgdatadir = $(datadir)/$(PACKAGE) |
| 51 | pkglibdir = $(libdir)/$(PACKAGE) |
| 52 | diff --git a/bin/Makefile b/bin/Makefile |
| 53 | index 52c1f50..e30610e 100644 |
| 54 | --- a/bin/Makefile |
| 55 | +++ b/bin/Makefile |
| 56 | @@ -1,22 +1,22 @@ |
| 57 | SHELL = /bin/sh |
| 58 | top_srcdir = .. |
| 59 | srcdir = ../bin |
| 60 | -prefix = /usr |
| 61 | -exec_prefix = ${prefix} |
| 62 | - |
| 63 | -bindir = ${exec_prefix}/bin |
| 64 | -sbindir = ${exec_prefix}/sbin |
| 65 | -libexecdir = ${exec_prefix}/libexec |
| 66 | -datadir = ${prefix}/share |
| 67 | -sysconfdir = ${prefix}/etc |
| 68 | -sharedstatedir = ${prefix}/com |
| 69 | -localstatedir = ${prefix}/var |
| 70 | -libdir = ${exec_prefix}/lib |
| 71 | -infodir = ${prefix}/info |
| 72 | +prefix ?= /usr |
| 73 | +exec_prefix ?= ${prefix} |
| 74 | + |
| 75 | +bindir ?= ${exec_prefix}/bin |
| 76 | +sbindir ?= ${exec_prefix}/sbin |
| 77 | +libexecdir ?= ${exec_prefix}/libexec |
| 78 | +datadir ?= ${prefix}/share |
| 79 | +sysconfdir ?= ${prefix}/etc |
| 80 | +sharedstatedir ?= ${prefix}/com |
| 81 | +localstatedir ?= ${prefix}/var |
| 82 | +libdir ?= ${exec_prefix}/lib |
| 83 | +infodir ?= ${prefix}/info |
| 84 | docdir = |
| 85 | -includedir = ${prefix}/include |
| 86 | +includedir ?= ${prefix}/include |
| 87 | oldincludedir = /usr/include |
| 88 | -mandir = ${prefix}/man |
| 89 | +mandir ?= ${prefix}/man |
| 90 | |
| 91 | pkgdatadir = $(datadir)/$(PACKAGE) |
| 92 | pkglibdir = $(libdir)/$(PACKAGE) |
| 93 | @@ -40,8 +40,11 @@ all: $(srcdir)/$(PACKAGE) |
| 94 | |
| 95 | |
| 96 | install: all installdirs |
| 97 | - $(INSTALL_BIN) $(srcdir)/$(PACKAGE) $(DESTDIR)$(bindir)/$(PACKAGE) |
| 98 | - $(INSTALL_BIN) $(srcdir)/modifyrepo $(DESTDIR)$(bindir)/modifyrepo |
| 99 | + sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/$(PACKAGE) > $(srcdir)/$(PACKAGE).tmp |
| 100 | + sed -e "s|@DATADIR@|$(datadir)|" $(srcdir)/modifyrepo > $(srcdir)/modifyrepo.tmp |
| 101 | + $(INSTALL_BIN) $(srcdir)/$(PACKAGE).tmp $(DESTDIR)$(bindir)/$(PACKAGE) |
| 102 | + $(INSTALL_BIN) $(srcdir)/modifyrepo.tmp $(DESTDIR)$(bindir)/modifyrepo |
| 103 | + rm -f $(srcdir)/$(PACKAGE).tmp $(srcdir)/modifyrepo.tmp |
| 104 | |
| 105 | |
| 106 | uninstall: |
| 107 | diff --git a/bin/createrepo b/bin/createrepo |
| 108 | index b0de515..eaacb39 100755 |
| 109 | --- a/bin/createrepo |
| 110 | +++ b/bin/createrepo |
| 111 | @@ -1,2 +1,2 @@ |
| 112 | #!/bin/sh |
| 113 | -exec /usr/share/createrepo/genpkgmetadata.py "$@" |
| 114 | +exec @DATADIR@/createrepo/genpkgmetadata.py "$@" |
| 115 | diff --git a/bin/modifyrepo b/bin/modifyrepo |
| 116 | index c9732d8..6f7c1d4 100755 |
| 117 | --- a/bin/modifyrepo |
| 118 | +++ b/bin/modifyrepo |
| 119 | @@ -1,2 +1,2 @@ |
| 120 | #!/bin/sh |
| 121 | -exec /usr/share/createrepo/modifyrepo.py "$@" |
| 122 | +exec @DATADIR@/createrepo/modifyrepo.py "$@" |
| 123 | diff --git a/docs/Makefile b/docs/Makefile |
| 124 | index 0a41179..e128c85 100644 |
| 125 | --- a/docs/Makefile |
| 126 | +++ b/docs/Makefile |
| 127 | @@ -1,22 +1,22 @@ |
| 128 | SHELL = /bin/sh |
| 129 | top_srcdir = .. |
| 130 | srcdir = ../docs |
| 131 | -prefix = /usr |
| 132 | -exec_prefix = ${prefix} |
| 133 | - |
| 134 | -bindir = ${exec_prefix}/bin |
| 135 | -sbindir = ${exec_prefix}/sbin |
| 136 | -libexecdir = ${exec_prefix}/libexec |
| 137 | -datadir = ${prefix}/share |
| 138 | -sysconfdir = ${prefix}/etc |
| 139 | -sharedstatedir = ${prefix}/com |
| 140 | -localstatedir = ${prefix}/var |
| 141 | -libdir = ${exec_prefix}/lib |
| 142 | -infodir = ${prefix}/info |
| 143 | +prefix ?= /usr |
| 144 | +exec_prefix ?= ${prefix} |
| 145 | + |
| 146 | +bindir ?= ${exec_prefix}/bin |
| 147 | +sbindir ?= ${exec_prefix}/sbin |
| 148 | +libexecdir ?= ${exec_prefix}/libexec |
| 149 | +datadir ?= ${prefix}/share |
| 150 | +sysconfdir ?= ${prefix}/etc |
| 151 | +sharedstatedir ?= ${prefix}/com |
| 152 | +localstatedir ?= ${prefix}/var |
| 153 | +libdir ?= ${exec_prefix}/lib |
| 154 | +infodir ?= ${prefix}/info |
| 155 | docdir = |
| 156 | -includedir = ${prefix}/include |
| 157 | +includedir ?= ${prefix}/include |
| 158 | oldincludedir = /usr/include |
| 159 | -mandir = ${datadir}/man |
| 160 | +mandir ?= ${datadir}/man |
| 161 | |
| 162 | pkgdatadir = $(datadir)/$(PACKAGE) |
| 163 | pkglibdir = $(libdir)/$(PACKAGE) |