summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-07-18 15:05:15 -0700
committerStefano Karapetsas <[email protected]>2013-07-18 15:05:15 -0700
commitc599a345825236d8e0c89c6c43a66d778422153d (patch)
tree2a7d6049b7f2e2299be487ea5eddb4e311e364bd
parent93a2ed0d29cd905560eb0a285d18c8096d79e931 (diff)
parent5c97d988bca602cb73efc7f3ae62a7fb51baff05 (diff)
downloadcaja-c599a345825236d8e0c89c6c43a66d778422153d.tar.bz2
caja-c599a345825236d8e0c89c6c43a66d778422153d.tar.xz
Merge pull request #141 from NiceandGently/master
fix privat icons dir and make files for automake-1.13
-rw-r--r--cut-n-paste-code/libegg/Makefile.am2
-rw-r--r--data/icons/Makefile.am6
-rw-r--r--eel/Makefile.am2
-rw-r--r--libcaja-extension/Makefile.am2
-rw-r--r--libcaja-private/Makefile.am2
-rw-r--r--src/Makefile.am2
-rw-r--r--test/Makefile.am2
7 files changed, 9 insertions, 9 deletions
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 \
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
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) \
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) \
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 \
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 \
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) \