From 43fce304a673d15ae8c9ca89474e37e3685765dd Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Thu, 18 Jul 2013 22:55:03 +0200 Subject: fix_privat-icons-dir to avoid this direction. %{_datadir}/mate-file-manager/icons/hicolor/*/emblems/emblem-note.png --- data/icons/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 82931541..87345eb4 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -61,8 +61,8 @@ install-icons: CONTEXT=`echo $$icon | cut -d_ -f2`; \ SIZE=`echo $$icon | cut -d_ -f3`; \ ICONFILE=`echo $$icon | cut -d_ -f4`; \ - mkdir -p $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ - $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ + $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ done uninstall-icons: @@ -78,7 +78,7 @@ uninstall-icons: CONTEXT=`echo $$icon | cut -d_ -f2`; \ SIZE=`echo $$icon | cut -d_ -f3`; \ ICONFILE=`echo $$icon | cut -d_ -f4`; \ - rm -f $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ + rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ done install-data-local: install-icons update-icon-cache -- cgit v1.2.1 From 51c6314e25851a6a5e852e00de8272d6984f687d Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Thu, 18 Jul 2013 22:57:38 +0200 Subject: INCLUDES to AM_CPPFLAGS --- cut-n-paste-code/libegg/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cut-n-paste-code/libegg/Makefile.am b/cut-n-paste-code/libegg/Makefile.am index 1ee4585d..3d6e3977 100644 --- a/cut-n-paste-code/libegg/Makefile.am +++ b/cut-n-paste-code/libegg/Makefile.am @@ -2,7 +2,7 @@ NULL= noinst_LTLIBRARIES = libegg.la -INCLUDES = $(LIBEGG_CFLAGS) +AM_CPPFLAGS = $(LIBEGG_CFLAGS) EGG_TREE_DND_FILES = \ eggtreemultidnd.c \ -- cgit v1.2.1 From d8a207223d7f69385898b5c78d0618ab2acd6e2a Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Thu, 18 Jul 2013 22:58:50 +0200 Subject: INCLUDES to AM_CPPFLAGS --- eel/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eel/Makefile.am b/eel/Makefile.am index aabbacb0..7919b80f 100644 --- a/eel/Makefile.am +++ b/eel/Makefile.am @@ -2,7 +2,7 @@ NULL= noinst_LTLIBRARIES=libeel-2.la -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\"Eel\" \ -I$(top_builddir) \ -I$(top_srcdir) \ -- cgit v1.2.1 From 91d11404e9136d9c75cccd7473c8f408fdd8595b Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Thu, 18 Jul 2013 23:00:23 +0200 Subject: INCLUDES to AM_CPPFLAGS --- libcaja-extension/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcaja-extension/Makefile.am b/libcaja-extension/Makefile.am index a3416204..597bcd06 100644 --- a/libcaja-extension/Makefile.am +++ b/libcaja-extension/Makefile.am @@ -4,7 +4,7 @@ include $(top_srcdir)/Makefile.shared lib_LTLIBRARIES=libcaja-extension.la -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ $(LIBCAJA_EXTENSION_CFLAGS) \ -- cgit v1.2.1 From 186a1e3abe265d01be102767c4ce113ed5dcb7be Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Thu, 18 Jul 2013 23:02:09 +0200 Subject: INCLUDES to AM_CPPFLAGS --- libcaja-private/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcaja-private/Makefile.am b/libcaja-private/Makefile.am index c80e1547..b3bffb2f 100644 --- a/libcaja-private/Makefile.am +++ b/libcaja-private/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.shared noinst_LTLIBRARIES=libcaja-private.la -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/cut-n-paste-code \ -- cgit v1.2.1 From 95f8fe17b9141f79e4beb39569d7f83b070f371b Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Thu, 18 Jul 2013 23:03:11 +0200 Subject: INCLUDES to AM_CPPFLAGS --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.am b/src/Makefile.am index 84ee8b5f..189c1f5f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,7 +13,7 @@ libexec_PROGRAMS = \ caja-convert-metadata \ $(NULL) -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/cut-n-paste-code \ -I$(top_builddir)/libcaja-private \ -- cgit v1.2.1 From 5c97d988bca602cb73efc7f3ae62a7fb51baff05 Mon Sep 17 00:00:00 2001 From: Wolfgang Ulbrich Date: Thu, 18 Jul 2013 23:04:29 +0200 Subject: INCLUDES to AM_CPPFLAGS --- test/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Makefile.am b/test/Makefile.am index 92b9fda0..242a7775 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,6 +1,6 @@ NULL= -INCLUDES =\ +AM_CPPFLAGS =\ -I$(top_srcdir) \ $(CORE_CFLAGS) \ $(WARNING_CFLAGS) \ -- cgit v1.2.1