summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-03-19 18:11:14 +0000
committerJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-03-19 19:15:22 +0000
commit4e06b8847f33c89372fe9e7a67fddf42b4585f9a (patch)
treefe295fdbe38d81e0421d5acfb59ae24e11f153bd
parentcca5177d276354412a6681d0a4151503b907f385 (diff)
downloadattr-4e06b8847f33c89372fe9e7a67fddf42b4585f9a.tar.gz
Use the correct sequence of configure commands needed for attr.
-rw-r--r--attr.morph10
-rw-r--r--configure.in1
2 files changed, 8 insertions, 3 deletions
diff --git a/attr.morph b/attr.morph
index 14d32ba..0d85d17 100644
--- a/attr.morph
+++ b/attr.morph
@@ -1,14 +1,18 @@
{
"name": "attr",
"kind": "chunk",
+ "comments": [
+ "The DESTDIR patch idea comes from: http://pkgs.fedoraproject.org/gitweb/?p=attr.git;a=blob_plain;f=attr-2.4.32-build.patch"
+ ],
"configure-commands": [
- "autoconf",
- "configure"
+ "sed -i -e 's,PKG_\\(.*\\)_DIR\\t= ,PKG_\\1_DIR\\t= \\$(DESTDIR),g' include/builddefs.in",
+ "sed -i -e 's,\\$\\$LOCAL_CONFIGURE_OPTIONS,\\$(LOCAL_CONFIGURE_OPTIONS),g' Makefile",
+ "make LOCAL_CONFIGURE_OPTIONS=\"--prefix=/usr --exec-prefix=/usr --sbindir=/usr/sbin --bindir=/usr/bin --libdir=/usr/lib --libexecdir=/usr/lib --enable-lib64=yes --includedir=/usr/include --mandir=/usr/share/man --datadir=/usr/share\" configure"
],
"build-commands": [
"make"
],
"install-commands": [
- "make DESTDIR=\"$DESTDIR\" install install-lib"
+ "make DESTDIR=\"$DESTDIR\" install-lib"
]
}
diff --git a/configure.in b/configure.in
index b966d0e..1328215 100644
--- a/configure.in
+++ b/configure.in
@@ -14,6 +14,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
AC_INIT(include/attributes.h)
+AC_SUBST([ACLOCAL_AMFLAGS], ["$ACLOCAL_FLAGS -I m4"])
AC_CONFIG_AUX_DIR([.])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADER(include/config.h)