From c0a3e0ca5b469fced6e1afa55067c82c5676d253 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 15 Jan 2011 17:27:57 +0000 Subject: [PATCH] fix wrong --prefix and DESTDIR usage (also needs buildsystem) git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1029 e54a6e83-5905-42d5-8d5c-058d10e6a962 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/2eb03385607bc73460fe99d1db01dfd0b73ae43f Author: Stefan Seyfried Date: 2011-01-15 (Sat, 15 Jan 2011) ------------------ This commit was generated by Migit --- acinclude.m4 | 6 +++--- data/scripts/Makefile.am | 4 ++-- src/nhttpd/web/scripts/Makefile.am | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index fc4617d21..6d3d2014d 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -256,10 +256,10 @@ fi AC_DEFUN([_TUXBOX_APPS_LIB_PKGCONFIG],[ AC_REQUIRE([TUXBOX_APPS_PKGCONFIG]) AC_MSG_CHECKING(for package $2) -if PKG_CONFIG_PATH="${prefix}/lib/pkgconfig" $PKG_CONFIG --exists "$2" ; then +if $PKG_CONFIG --exists "$2" ; then AC_MSG_RESULT(yes) - $1_CFLAGS=$(PKG_CONFIG_PATH="${prefix}/lib/pkgconfig" $PKG_CONFIG --cflags "$2") - $1_LIBS=$(PKG_CONFIG_PATH="${prefix}/lib/pkgconfig" $PKG_CONFIG --libs "$2") + $1_CFLAGS=$($PKG_CONFIG --cflags "$2") + $1_LIBS=$($PKG_CONFIG --libs "$2") else AC_MSG_RESULT(no) fi diff --git a/data/scripts/Makefile.am b/data/scripts/Makefile.am index fdd502032..983eb7c4d 100644 --- a/data/scripts/Makefile.am +++ b/data/scripts/Makefile.am @@ -1,4 +1,4 @@ -installdir = $(DESTDIR)$(bindir) +installdir = $(bindir) install_DATA = \ backup.sh \ @@ -8,4 +8,4 @@ install_DATA = \ install-data-hook: chmod 0755 $(DESTDIR)$(bindir)/backup.sh chmod 0755 $(DESTDIR)$(bindir)/restore.sh - chmod 0755 $(DESTDIR)$(bindir)/install.sh \ No newline at end of file + chmod 0755 $(DESTDIR)$(bindir)/install.sh diff --git a/src/nhttpd/web/scripts/Makefile.am b/src/nhttpd/web/scripts/Makefile.am index 390f9d868..09adfb357 100644 --- a/src/nhttpd/web/scripts/Makefile.am +++ b/src/nhttpd/web/scripts/Makefile.am @@ -3,5 +3,5 @@ installdir = $(DATADIR)/neutrino/httpd/scripts install_DATA= api.sh _Y_Globals.sh _Y_Library.sh Y_Live.sh Y_Tools.sh install-data-hook: - chmod 0755 $(DATADIR)/neutrino/httpd/scripts/api.sh - chmod 0755 $(DATADIR)/neutrino/httpd/scripts/Y_*.sh + chmod 0755 $(DESTDIR)$(DATADIR)/neutrino/httpd/scripts/api.sh + chmod 0755 $(DESTDIR)$(DATADIR)/neutrino/httpd/scripts/Y_*.sh