Bugfix: html files don't obey DESTDIR

[Daniel Macks]

In gdome2-0.8.1, the install-data-local target ignores the DESTDIR
variable. That means when I 'make install DESTDIR=/tmp/packaging-dir',
the doc files are installed directly into the --prefix I passed to
./configure, not into my temp packaging directory. Solution:

diff -Nurd -x'*~' gdome2-0.8.1.orig/gtk-doc/Makefile.am gdome2-0.8.1/gtk-doc/Makefile.am
--- gdome2-0.8.1.orig/gtk-doc/Makefile.am 2002-04-04 01:58:04.000000000 -0500
+++ gdome2-0.8.1/gtk-doc/Makefile.am 2006-03-03 18:24:03.000000000 -0500
@@ -33,10 +33,10 @@
  rm -rf sgml html gdome2-decl-list.txt gdome2-decl.txt
 
 install-data-local:
- -install -d -m 0755 $(TARGET_DIR)
- -install -m 0644 $(srcdir)/html/*.html $(TARGET_DIR)
- -install -m 0644 $(srcdir)/html/index.sgml $(TARGET_DIR)
- -(cd $(DESTDIR); gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR))
+ -install -d -m 0755 $(DESTDIR)$(TARGET_DIR)
+ -install -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR)
+ -install -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)
+ -(cd $(DESTDIR); gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(DESTDIR)$(HTML_DIR))
 
 .PHONY : html sgml templates scan
 
dan

--
Daniel Macks
dmacks@...
http://www.netspace.org/~dmacks

_______________________________________________
gdome mailing list
gdome@...
http://mail.gnome.org/mailman/listinfo/gdome

[Luca Padovani-2]

Hi Daniel,

On 08/mar/06, at 18:08, Daniel Macks wrote:
> dir=$(HTML_DIR))
> + -install -d -m 0755 $(DESTDIR)$(TARGET_DIR)
> + -install -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR)
> + -install -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)
> + -(cd $(DESTDIR); gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=
> $(DESTDIR)$(HTML_DIR))

I'm a bit confused. According to the CVS this is already the status  
of gtk-doc/Makefile.am, see

        http://cvs.gnome.org/viewcvs/gdome2/gtk-doc/

It seems like the latest tarball did not include these changes.

--luca
_______________________________________________
gdome mailing list
gdome@...
http://mail.gnome.org/mailman/listinfo/gdome

[Daniel Macks]

On Wed, Mar 22, 2006 at 08:20:28AM +0100, Luca Padovani wrote:

> On 08/mar/06, at 18:08, Daniel Macks wrote:
> >dir=$(HTML_DIR))
> >+ -install -d -m 0755 $(DESTDIR)$(TARGET_DIR)
> >+ -install -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR)
> >+ -install -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR)
> >+ -(cd $(DESTDIR); gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=
> >$(DESTDIR)$(HTML_DIR))
>
> I'm a bit confused. According to the CVS this is already the status  
> of gtk-doc/Makefile.am, see
>
> http://cvs.gnome.org/viewcvs/gdome2/gtk-doc/

Ah yes, so it is. Glad to see I was on the right track about solving
it:)

> It seems like the latest tarball did not include these changes.

That indeed is the case.

It might be useful to tag the versions of the CVS files when you
release a tarball (release_0_8_1 or something like that?). That way
it's easy for people to generate a patch that upgrades a given tarball
distribution to the latest CVS files.

dan

--
Daniel Macks
dmacks@...
http://www.netspace.org/~dmacks

_______________________________________________
gdome mailing list
gdome@...
http://mail.gnome.org/mailman/listinfo/gdome