summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pjm@nac.net>2012-11-15 17:11:46 (EST)
committer P. J. McDermott <pjm@nac.net>2012-11-15 17:11:46 (EST)
commit58a817b684ce0d52933061626b90879651abd999 (patch)
treefc0c8447484a38570912a84287f0a6b9f36ed19f
parent7821b0a6cbd272825719de3dca7cbefb643d18bf (diff)
Use multiarch library directories.
-rwxr-xr-xbuild2
-rw-r--r--libexpat.1-dev.pkg/files6
-rw-r--r--libexpat.1.pkg/files2
3 files changed, 5 insertions, 5 deletions
diff --git a/build b/build
index 7cf3368..5a847bd 100755
--- a/build
+++ b/build
@@ -10,7 +10,7 @@ build: configure
install: build
oh-autoinstall
- rm -f dest/usr/lib/libexpat.la
+ rm -f dest/usr/lib/$(OPK_HOST_ARCH)/libexpat.la
oh-fixperms
oh-strip -k
oh-installfiles
diff --git a/libexpat.1-dev.pkg/files b/libexpat.1-dev.pkg/files
index eb790be..8365432 100644
--- a/libexpat.1-dev.pkg/files
+++ b/libexpat.1-dev.pkg/files
@@ -1,4 +1,4 @@
/usr/include
-/usr/lib/libexpat.so
-/usr/lib/libexpat.a
-/usr/lib/pkgconfig
+/usr/lib/*/libexpat.so
+/usr/lib/*/libexpat.a
+/usr/lib/*/pkgconfig
diff --git a/libexpat.1.pkg/files b/libexpat.1.pkg/files
index fb5f9fb..8a4a841 100644
--- a/libexpat.1.pkg/files
+++ b/libexpat.1.pkg/files
@@ -1 +1 @@
-/usr/lib/libexpat.so.*
+/usr/lib/*/libexpat.so.*