diff options
| author | Stefano Karapetsas <[email protected]> | 2013-06-30 12:24:20 -0700 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-06-30 12:24:20 -0700 |
| commit | acfd1c87ed18b0cf500a1ed35b1ae7237e7af552 (patch) | |
| tree | 1d9a4b8b6d0aaf19a95aacae319905a9cc752d12 | |
| parent | 4b109f91be36779664a8c571d976aaaa9134a83e (diff) | |
| parent | c76841b1f470c7daf62df9482a55e1143a77086c (diff) | |
| download | mate-control-center-acfd1c87ed18b0cf500a1ed35b1ae7237e7af552.tar.bz2 mate-control-center-acfd1c87ed18b0cf500a1ed35b1ae7237e7af552.tar.xz | |
Merge pull request #59 from NiceandGently/master
fix multiply defined AM_CPPFLAGS/INCLUDES in /shell/Makefile.am
| -rw-r--r-- | shell/Makefile.am | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index 858ffa53..fcc95531 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -1,10 +1,11 @@ REAL_LIBSLAB_CFLAGS = -I$(top_srcdir)/libslab REAL_LIBSLAB_LIBS = $(top_builddir)/libslab/libslab.la -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ - $(REAL_LIBSLAB_CFLAGS) \ - $(MATECC_SHELL_CFLAGS) + $(REAL_LIBSLAB_CFLAGS) \ + $(MATECC_SHELL_CFLAGS) \ + -DMATELOCALEDIR="\"$(datadir)/locale\"" bin_PROGRAMS = mate-control-center @@ -15,9 +16,6 @@ mate_control_center_LDADD = \ $(MATECC_SHELL_LIBS) \ $(REAL_LIBSLAB_LIBS) -AM_CPPFLAGS = \ - -DMATELOCALEDIR="\"$(datadir)/locale\"" - sysdir = $(datadir)/applications sys_in_files = matecc.desktop.in sys_DATA = $(sys_in_files:.desktop.in=.desktop) |