public inbox for sourcenav@sourceware.org
 help / color / mirror / Atom feed
* Fix for HTML installation
@ 2000-07-27  9:37 Warren Jones
  2000-07-27 10:35 ` Syd Polk
  0 siblings, 1 reply; 2+ messages in thread
From: Warren Jones @ 2000-07-27  9:37 UTC (permalink / raw)
  To: sourcenav

There's a minor bug in snavigator/doc/html/Makefile.in.

When installing HTML docs, the Makefile changes directories,
but doesn't change back.  This can cause the install to fail
if $srcdir is a relative path (e.g. srcdir=.).  Putting the
"cd" in a subshell avoids the problem.  I'm including a patch.
Here's a ChangeLog entry:

2000-07-27  Warren Jones <wjones@tc.fluke.com>

	* doc/html/Makefile.in: Make sure we stay in the right directory
	when installing docs.

-- 
Warren Jones
Fluke Corporation

Index: Makefile.in
===================================================================
RCS file: /usr0/sweng/src/active/CVS.repo/snavigator/snavigator/doc/html/Makefile.in,v
retrieving revision 1.1.1.1
diff -c -3 -p -r1.1.1.1 Makefile.in
*** Makefile.in	2000/07/25 22:05:51	1.1.1.1
--- Makefile.in	2000/07/26 20:10:05
*************** install-data-local: $(htmldir)/index.htm
*** 341,352 ****
--- 341,354 ----
  		$(mkinstalldirs) $(htmldir)/$$p; \
  		rm -f $(htmldir)/$$p/*.html; \
  		rm -f $(htmldir)/$$p/*.gif; \
+ 		( \
  		cd $(srcdir)/@SN_DOCSET@/$$p ;\
  		echo "cd $(htmldir)/$$p ; $(TAR) -xBpf -" > /tmp/foo-$$$$ ;\
  		chmod u+x /tmp/foo-$$$$ ;\
  		$(TAR) -chf - *.gif | /tmp/foo-$$$$ ;\
  		$(TAR) -chf - *.html | /tmp/foo-$$$$ ;\
  		rm /tmp/foo-$$$$ ;\
+ 		) \
  	done;
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: Fix for HTML installation
  2000-07-27  9:37 Fix for HTML installation Warren Jones
@ 2000-07-27 10:35 ` Syd Polk
  0 siblings, 0 replies; 2+ messages in thread
From: Syd Polk @ 2000-07-27 10:35 UTC (permalink / raw)
  To: Warren Jones, sourcenav

This should actually be changed in Makefile.am. Our Makefile.in files are 
generated by automake.

At 09:36 AM 7/27/00 -0700, Warren Jones wrote:
>There's a minor bug in snavigator/doc/html/Makefile.in.
>
>When installing HTML docs, the Makefile changes directories,
>but doesn't change back.  This can cause the install to fail
>if $srcdir is a relative path (e.g. srcdir=.).  Putting the
>"cd" in a subshell avoids the problem.  I'm including a patch.
>Here's a ChangeLog entry:
>
>2000-07-27  Warren Jones <wjones@tc.fluke.com>
>
>         * doc/html/Makefile.in: Make sure we stay in the right directory
>         when installing docs.
>
>--
>Warren Jones
>Fluke Corporation
>
>Index: Makefile.in
>===================================================================
>RCS file: 
>/usr0/sweng/src/active/CVS.repo/snavigator/snavigator/doc/html/Makefile.in,v
>retrieving revision 1.1.1.1
>diff -c -3 -p -r1.1.1.1 Makefile.in
>*** Makefile.in 2000/07/25 22:05:51     1.1.1.1
>--- Makefile.in 2000/07/26 20:10:05
>*************** install-data-local: $(htmldir)/index.htm
>*** 341,352 ****
>--- 341,354 ----
>                 $(mkinstalldirs) $(htmldir)/$$p; \
>                 rm -f $(htmldir)/$$p/*.html; \
>                 rm -f $(htmldir)/$$p/*.gif; \
>+               ( \
>                 cd $(srcdir)/@SN_DOCSET@/$$p ;\
>                 echo "cd $(htmldir)/$$p ; $(TAR) -xBpf -" > /tmp/foo-$$$$ ;\
>                 chmod u+x /tmp/foo-$$$$ ;\
>                 $(TAR) -chf - *.gif | /tmp/foo-$$$$ ;\
>                 $(TAR) -chf - *.html | /tmp/foo-$$$$ ;\
>                 rm /tmp/foo-$$$$ ;\
>+               ) \
>         done;
>
>   # Tell versions [3.59,3.63) of GNU make to not export all variables.

Syd Polk		spolk@redhat.com
Engineering Manager	+1 415 777 9810 x 241
Red Hat, Inc.



^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2000-07-27 10:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2000-07-27  9:37 Fix for HTML installation Warren Jones
2000-07-27 10:35 ` Syd Polk

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).