[PATCH] Do not hardcode "/usr/share" in build scripts.
- From: Stefano Sabatini <stefano sabatini-lala poste it>
- To: sawfish-list Mailing List <sawfish-list gnome org>
- Cc: Stefano Sabatini <stefano arborea caos org>
- Subject: [PATCH] Do not hardcode "/usr/share" in build scripts.
- Date: Sat, 4 Dec 2010 13:26:52 +0100
From: Stefano Sabatini <stefano arborea caos org>
Use ${datadir} instead.
---
configure.in | 2 +-
lisp/sawfish/cfg/Makefile.in | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure.in b/configure.in
index f4edf2f..6cb4845 100644
--- a/configure.in
+++ b/configure.in
@@ -333,7 +333,7 @@ dnl install directory for sawfish-ksm.desktop
KDEDIR="`kde4-config --install data`"
if test "x$KDEDIR" = x; then
- KDEDIR="/usr/share/kde4/apps/"
+ KDEDIR="${datadir}/kde4/apps/"
fi
gitdate=`date +%y%m%d`
diff --git a/lisp/sawfish/cfg/Makefile.in b/lisp/sawfish/cfg/Makefile.in
index 7d93a1f..1b195f7 100644
--- a/lisp/sawfish/cfg/Makefile.in
+++ b/lisp/sawfish/cfg/Makefile.in
@@ -79,7 +79,7 @@ install : all installdirs
$(INSTALL_DATA) $$p $(DESTDIR)${lispdir}/sawfish/cfg/layouts; \
done
$(INSTALL_SCRIPT) main.jlc $(DESTDIR)${bindir}/sawfish-config
- $(INSTALL_DATA) sawfish-config.png $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/
+ $(INSTALL_DATA) sawfish-config.png $(DESTDIR)${datadir}/icons/hicolor/32x32/apps/
uninstall :
rm -rf $(DESTDIR)${lispdir}/sawfish/cfg
@@ -90,7 +90,7 @@ installdirs : $(top_srcdir)/mkinstalldirs
$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(lispdir)/sawfish/cfg \
$(DESTDIR)$(lispdir)/sawfish/cfg/widgets \
$(DESTDIR)$(lispdir)/sawfish/cfg/layouts $(DESTDIR)$(bindir) \
- $(DESTDIR)/usr/share/icons/hicolor/32x32/apps/
+ $(DESTDIR)${datadir}/icons/hicolor/32x32/apps/
clean :
rm -f *.jlc *~ core
--
1.7.2.3
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]