summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBojan Popovic <bocke@slacware-srbija.org>2013-03-04 00:05:08 -0500
committerdsomero <xgizzmo@slackbuilds.org>2013-03-04 17:26:52 -0500
commit1c808b2c16cf03f8ea1cb18137410010b9f62b09 (patch)
treebafaa1ba078f7e9def930d49795d298e0dd1cb0e
parent18f0017e62cb6708d61e916dd8b50b84e6a6b811 (diff)
downloadslackbuilds-1c808b2c16cf03f8ea1cb18137410010b9f62b09.tar.gz
libraries/xawplus: Fix to makefile patch (fixed include directories)
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
-rw-r--r--libraries/xawplus/makefile-fixes.patch8
-rw-r--r--libraries/xawplus/xawplus.SlackBuild2
2 files changed, 5 insertions, 5 deletions
diff --git a/libraries/xawplus/makefile-fixes.patch b/libraries/xawplus/makefile-fixes.patch
index e106304df7..f2bcf19b0b 100644
--- a/libraries/xawplus/makefile-fixes.patch
+++ b/libraries/xawplus/makefile-fixes.patch
@@ -69,15 +69,15 @@
- cp libXaw.so.7.0 $(INST_LIBS)
- ldconfig
- ln -s $(INST_LIBS)/libXaw.so.6.6 $(INST_LIBS)/libXaw.so
-+ install -m 755 -d $(DESTDIR)/usr/include/X11
++ install -m 755 -d $(DESTDIR)/usr/include/X11/XawPlus
+ install -m 755 -d $(DESTDIR)$(INST_LIBS)
-+ install -m 644 ./X11/XawPlus/*.h $(DESTDIR)/usr/include/X11
++ install -m 644 ./X11/XawPlus/*.h $(DESTDIR)/usr/include/X11/XawPlus
+ install -m 644 libXawPlus.so.3.1 $(DESTDIR)$(INST_LIBS)
+
+install-static:
-+ install -m 755 -d $(DESTDIR)/usr/include/X11
++ install -m 755 -d $(DESTDIR)/usr/include/X11/XawPlus
+ install -m 755 -d $(DESTDIR)$(INST_LIBS)
-+ install -m 644 ./X11/XawPlus/*.h $(DESTDIR)/usr/include/X11
++ install -m 644 ./X11/XawPlus/*.h $(DESTDIR)/usr/include/X11/XawPlus
+ install -m 644 libXawPlus.a $(DESTDIR)$(INST_LIBS)
# --- Common
diff --git a/libraries/xawplus/xawplus.SlackBuild b/libraries/xawplus/xawplus.SlackBuild
index bec607ae22..f8a244205d 100644
--- a/libraries/xawplus/xawplus.SlackBuild
+++ b/libraries/xawplus/xawplus.SlackBuild
@@ -81,7 +81,7 @@ export INST_LIBS=/usr/lib${LIBDIRSUFFIX}
make -j1 DESTDIR=$PKG
-cd $PKG/usr/lib${LIBDIRSUFFIX}
+cd $PKG/usr/lib${LIBDIRSUFFIX}
ln -sf libXawPlus.so.3.1 libXawPlus.so
ln -sf libXawPlus.so.3.1 libXawPlus.so.3
cd $TMP/$PRGNAM-$VERSION