projects
/
projects
/
chimara
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Install gobject introspection files in correct dir
[projects/chimara/chimara.git]
/
libchimara
/
Makefile.am
diff --git
a/libchimara/Makefile.am
b/libchimara/Makefile.am
index 81c5bc7aec27e371752f666a958b12e63cb0c43e..8f7c216754655768c88487ad7662f7fb794bdc79 100644
(file)
--- a/
libchimara/Makefile.am
+++ b/
libchimara/Makefile.am
@@
-4,12
+4,6
@@
AM_CFLAGS = -Wall
lib_LTLIBRARIES = libchimara.la
lib_LTLIBRARIES = libchimara.la
-if TARGET_ILIAD
-pluginpath = "../interpreters"
-else
-pluginpath = $(pkglibdir)
-endif
-
libchimara_la_SOURCES = \
abort.c abort.h \
case.c \
libchimara_la_SOURCES = \
abort.c abort.h \
case.c \
@@
-45,7
+39,7
@@
libchimara_la_SOURCES = \
libchimara_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DG_LOG_DOMAIN=\"Chimara\" \
-DLOCALEDIR=\""$(datadir)/locale"\" \
libchimara_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DG_LOG_DOMAIN=\"Chimara\" \
-DLOCALEDIR=\""$(datadir)/locale"\" \
- -DPLUGINDIR=\""$(p
luginpath
)"\" \
+ -DPLUGINDIR=\""$(p
kglibdir
)"\" \
-DPLUGINSOURCEDIR=\""$(abs_builddir)/../interpreters"\" \
-I$(top_srcdir)
libchimara_la_CFLAGS = @CHIMARA_CFLAGS@ $(AM_CFLAGS)
-DPLUGINSOURCEDIR=\""$(abs_builddir)/../interpreters"\" \
-I$(top_srcdir)
libchimara_la_CFLAGS = @CHIMARA_CFLAGS@ $(AM_CFLAGS)
@@
-95,10
+89,10
@@
Chimara_1_0_gir_SCANNERFLAGS = \
Chimara_1_0_gir_EXPORT_PACKAGES = chimara
INTROSPECTION_GIRS += Chimara-1.0.gir
Chimara_1_0_gir_EXPORT_PACKAGES = chimara
INTROSPECTION_GIRS += Chimara-1.0.gir
-girdir =
$(datadir)/gir-1.0
+girdir =
@INTROSPECTION_GIRDIR@
gir_DATA = $(INTROSPECTION_GIRS)
gir_DATA = $(INTROSPECTION_GIRS)
-typelibdir =
$(libdir)/girepository-1.0
+typelibdir =
@INTROSPECTION_TYPELIBDIR@
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
CLEANFILES += $(gir_DATA) $(typelib_DATA)
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
CLEANFILES += $(gir_DATA) $(typelib_DATA)