enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

merge: fix PACKAGE_DATA_DIR value 

The package is named 'efl', but we have to use the name of the library,
so $(pkgdatadir) or $(PACKAGE) should not be used


SVN revision: 78805
This commit is contained in:
Vincent Torri 2012-11-01 16:45:53 +00:00
parent ca20fab7d4
commit 5b00d44ec6
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile_Eet.am
View File

@ -31,7 +31,7 @@ lib_eet_libeet_la_CPPFLAGS = \
-I$(top_builddir)/src/lib/eet/lz4 \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \
-DEFL_EET_BUILD \
@EFL_CFLAGS@ \
@EET_CFLAGS@

5
src/Makefile_Embryo.am
View File

@ -21,7 +21,7 @@ lib_embryo_libembryo_la_CPPFLAGS = \
-I$(top_builddir)/src/lib/eina \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
-DEFL_EMBRYO_BUILD \
@EFL_CFLAGS@
@ -68,7 +68,7 @@ bin_embryo_embryo_cc_CPPFLAGS = \
-I$(top_builddir)/src/lib/embryo \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
@EFL_CFLAGS@
if HAVE_WINDOWS
@ -88,4 +88,3 @@ endif
EXTRA_DIST += \
bin/embryo/embryo_cc_sc5.scp \
bin/embryo/embryo_cc_sc7.scp