diff options
| author | Colin Walters <walters@verbum.org> | 2012-01-11 15:05:03 -0500 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2012-01-11 15:05:03 -0500 |
| commit | 58ec0d8593541ef7ae522ce42ebec6f98536c4e0 (patch) | |
| tree | 444f0f196b7b29690e2b23b1c1568829a237e2c1 | |
| parent | aebc2a1895f2d2f7108437b01f71792856960f45 (diff) | |
| download | gtk-doc-stub-58ec0d8593541ef7ae522ce42ebec6f98536c4e0.tar.gz | |
Move gtk-doc-make to ${datadir}/gtk-doc-devel/baserock/morph
OSTree's build process wants to auto-detect everything in
${datadir}/gtk-doc/ as documentation, but this clearly breaks if the
gtk-doc makefile is in there too. Let's just move it.
| -rw-r--r-- | Makefile | 6 | ||||
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | gtkdocize.in | 6 |
3 files changed, 7 insertions, 7 deletions
@@ -2,7 +2,7 @@ include Makefile.inc bin_programs = gtkdocize -gtkdocize: $(srcdir)/gtkdocize.in +gtkdocize: $(srcdir)/gtkdocize.in Makefile sed -e "s,@sysconfdir\@,$(sysconfdir)," \ -e "s,@prefix\@,$(prefix)," \ -e "s,@datadir\@,$(datadir)," \ @@ -18,8 +18,8 @@ install: $(bin_programs) install -m 0755 $$prog $(DESTDIR)$(bindir)/$$prog; \ done - mkdir -p $(DESTDIR)$(datarootdir)/gtk-doc/data - install -m 0644 $(srcdir)/gtk-doc.make $(DESTDIR)$(datarootdir)/gtk-doc/data/gtk-doc.make + mkdir -p $(DESTDIR)$(datarootdir)/gtk-doc-devel + install -m 0644 $(srcdir)/gtk-doc.make $(DESTDIR)$(datarootdir)/gtk-doc-devel/gtk-doc.make mkdir -p $(DESTDIR)$(datarootdir)/aclocal/ install -m 0644 $(srcdir)/gtk-doc.m4 $(DESTDIR)$(datarootdir)/aclocal/gtk-doc.m4 @@ -54,7 +54,7 @@ bindir ?= ${bindir:-${prefix}/bin} sbindir ?= ${sbindir:-${prefix}/sbin} libexecdir ?= ${libexecdir:-${prefix}/libexec} datarootdir ?= ${datarootdir:-${prefix}/share} -datadir ?= ${datadir:-${datarootdir}} +datadir ?= ${datadir:-${prefix}/share} sysconfdir ?= ${sysconfdir:-${prefix}/etc} libdir ?= ${libdir:-${prefix}/lib} mandir ?= ${mandir:-${prefix}/share/man} diff --git a/gtkdocize.in b/gtkdocize.in index 3f19dcb..93d4acc 100644 --- a/gtkdocize.in +++ b/gtkdocize.in @@ -115,10 +115,10 @@ fi rm -f $docdir/gtk-doc.make if test "$copy" = yes; then - cp -f $datadir/gtk-doc/data/gtk-doc.make $docdir/gtk-doc.make || + cp -f $datadir/gtk-doc-devel/gtk-doc.make $docdir/gtk-doc.make || exit 1 else - ln -sf $datadir/gtk-doc/data/gtk-doc.make $docdir/gtk-doc.make || - cp -f $datadir/gtk-doc/data/gtk-doc.make $docdir/gtk-doc.make || + ln -sf $datadir/gtk-doc-devel/gtk-doc.make $docdir/gtk-doc.make || + cp -f $datadir/gtk-doc-devel/gtk-doc.make $docdir/gtk-doc.make || exit 1 fi |