diff options
| author | Sergey Udaltsov <svu@gnome.org> | 2003-11-04 23:44:11 +0000 |
|---|---|---|
| committer | Sergey Udaltsov <svu@gnome.org> | 2003-11-04 23:44:11 +0000 |
| commit | 46e5eaad522898363c4f4867e3a98e3aedcb6db7 (patch) | |
| tree | bb4bd3c6b22613cf5591a8fd89cbf52d6a3bf386 | |
| parent | 8a00635316ac4136c061068a9447d24ece1bbc4a (diff) | |
| download | libxklavier-46e5eaad522898363c4f4867e3a98e3aedcb6db7.tar.gz | |
doxygen disabled by default - and docs are included in tarball
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | doc/html/Makefile.am | 22 | ||||
| -rw-r--r-- | libxklavier.spec.in | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/configure.in b/configure.in index a0b9838..1fa0a9e 100644 --- a/configure.in +++ b/configure.in @@ -64,8 +64,8 @@ fi AC_DEFINE_UNQUOTED(XKB_BASE,"${xkb_base}",Base for XKB configuration) AC_ARG_ENABLE(doxygen, -[ --disable-doxygen Do not build doxygen documentation], -, enable_doxygen=yes) +[ --enable-doxygen Build doxygen documentation], +, enable_doxygen=no) AC_SUBST(DO_DOXYGEN,"${enable_doxygen}") diff --git a/doc/html/Makefile.am b/doc/html/Makefile.am index dd145d2..f91c8f8 100644 --- a/doc/html/Makefile.am +++ b/doc/html/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_WEB_FILES = doxygen.css\ +EXTRA_WEB_FILES = doxygen.css \ doxygen.png HTML_FILES = annotated.html\ @@ -35,23 +35,23 @@ HTML_FILES = annotated.html\ DOXYGEN_OUT_FILES = $(EXTRA_WEB_FILES) $(HTML_FILES) -html_to = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html +doc_to = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html -html_files = $(DOXYGEN_OUT_FILES) +doc_files = $(DOXYGEN_OUT_FILES) + +EXTRA_DIST= $(doc_files) install: @$(NORMAL_INSTALL) - if test "x$(DO_DOXYGEN)" = "xyes"; then \ - $(mkinstalldirs) $(DESTDIR)$(html_to); \ - for p in $(html_files); do \ - $(INSTALL_DATA) $$p $(DESTDIR)$(html_to)/$$p; \ - done; \ - fi + $(mkinstalldirs) $(DESTDIR)$(doc_to); \ + for p in $(doc_files); do \ + $(INSTALL_DATA) $$p $(DESTDIR)$(doc_to)/$$p; \ + done; \ uninstall: @$(NORMAL_UNINSTALL) - for p in $(html_files); do \ - rm -f $(DESTDIR)$(html_to)/$$p; \ + for p in $(doc_files); do \ + rm -f $(DESTDIR)$(doc_to)/$$p; \ done MAINTAINERCLEANFILES = $(DOXYGEN_OUT_FILES) diff --git a/libxklavier.spec.in b/libxklavier.spec.in index 8b3d3e4..547b9dc 100644 --- a/libxklavier.spec.in +++ b/libxklavier.spec.in @@ -28,7 +28,7 @@ Libraries, include files, etc you can use to develop libxklavier applications. CONFIG_FLAGS="--prefix=%{_prefix} --libdir=%{_libdir} \ --includedir=%{_includedir} --bindir=%{_bindir} \ - --enable-doxygen" + --disable-doxygen" if [ ! -f configure ]; then CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh $CONFIG_FLAGS |