diff options
| author | Nickolay V. Shmyrev <nshmyrev@yandex.ru> | 2009-07-15 06:52:19 (GMT) |
|---|---|---|
| committer | Nickolay V. Shmyrev <nshmyrev@yandex.ru> | 2009-07-15 06:54:44 (GMT) |
| commit | 5b96694056a9bfbbeca84a44dfbe9eb82d684e10 (patch) | |
| tree | 5b6e6e7c9ccf939c77bb7781e500806f1ccf2127 | |
| parent | ee482efd857efc73d39198444b64908d1a095d03 (diff) | |
[build] Don't install schema files without gconf
Fixes issue with schema files installed into root folder
| -rw-r--r-- | data/Makefile.am | 8 | ||||
| -rw-r--r-- | thumbnailer/Makefile.am | 6 |
2 files changed, 13 insertions, 1 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 4d54847..22ecc66 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -41,6 +41,7 @@ desktop_DATA = $(DESKTOP_FILES) # GConf schema # +if WITH_GCONF @INTLTOOL_SCHEMAS_RULE@ schema_in_files = evince.schemas.in @@ -71,6 +72,13 @@ if GCONF_SCHEMAS_INSTALL fi endif +else + +install-schemas: +uninstall-schemas: + +endif + # # GTK icon cache # diff --git a/thumbnailer/Makefile.am b/thumbnailer/Makefile.am index adc5bd4..b974b4f 100644 --- a/thumbnailer/Makefile.am +++ b/thumbnailer/Makefile.am @@ -1,4 +1,3 @@ -@INTLTOOL_SCHEMAS_RULE@ bin_PROGRAMS = evince-thumbnailer @@ -36,6 +35,10 @@ schema_files = \ evince-thumbnailer-ps.schemas.in \ evince-thumbnailer.schemas.in +if WITH_GCONF + +@INTLTOOL_SCHEMAS_RULE@ + schema_DATA = if ENABLE_PDF @@ -68,6 +71,7 @@ if GCONF_SCHEMAS_INSTALL done \ fi endif +endif EXTRA_DIST = \ $(schema_files) |