You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "C. Scott Ananian" <ca...@lesser-magoo.lcs.mit.edu> on 2001/08/20 17:21:40 UTC
makefile patch.
The 'make doc-dvi' target is broken: it puts the .dvi files in the
subversion root directory instead of in the same directory as the source
.dvi file. Appended is a patch to fix this (my first patch! whee!).
--s
NORAD shotgun security AK-47 Suharto DES Semtex Chechnya AP plastique
genetic MI6 colonel Clinton DC Flintlock Treasury assassinate Boston
( http://lesser-magoo.lcs.mit.edu/~cananian )
Index: Makefile.in
===================================================================
RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/Makefile.in,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile.in
--- Makefile.in 2001/08/15 00:23:24 1.27
+++ Makefile.in 2001/08/20 17:20:14
@@ -203,7 +203,7 @@ dist:
$(MAKEINFO) -I `dirname $(top_srcdir)/$<` -o $@ $<
.texi.dvi:
- $(TEXI2DVI) -I `dirname $(top_srcdir)/$<` $<
+ cd `dirname $(top_srcdir)/$<` ; $(TEXI2DVI) -I . `basename $<`
.texi.txt:
$(MAKEINFO) -I `dirname $(top_srcdir)/$<` --no-headers -o $@ $<
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: makefile patch.
Posted by kf...@collab.net.
"C. Scott Ananian" <ca...@lesser-magoo.lcs.mit.edu> writes:
> OK, here's the fixed version of the 'make doc-*' patch. I added a
> 'doc-clean' target, while I was at it. I've tested this, and it does work
> with
> % mkdir BUILD
> % ../configure --enable-maintainer-mode --srcdir=..
> % make doc-pdf
Thanks, this has been needed for some time! Applied, with some minor
tweaks for consistency (see the commit for more).
Keep 'em coming...
-Karl, always happy to handle patches, but hoping people will
understand somewhat slow response times from him and other
committers this week, as most efforts are going to fixing the
repository problems that are preventing self-hosting right
now.
> Index: Makefile.in
> ===================================================================
> RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/Makefile.in,v
> retrieving revision 1.27
> diff -u -p -r1.27 Makefile.in
> --- Makefile.in 2001/08/15 00:23:24 1.27
> +++ Makefile.in 2001/08/20 19:34:48
> @@ -8,6 +8,8 @@ VPATH = @top_srcdir@
> SVN_RA_LIB_DEPS = @SVN_RA_LIB_DEPS@
> SVN_RA_LIB_LINK = @SVN_RA_LIB_LINK@
>
> +DOC_DIRS = doc/programmer/design doc/user/manual
> +
> EXTERNAL_PROJECT_DIRS = neon apr @DB_SUBDIR@
>
> SVN_APR_LIBS = @SVN_APR_LIBS@
> @@ -133,7 +135,7 @@ check: $(TEST_DEPS)
> fi
>
> mkdir-init:
> - @list='$(BUILD_DIRS)'; for i in $$list; do \
> + @list='$(BUILD_DIRS) $(DOC_DIRS)'; for i in $$list doc; do \
> echo "$(MKDIR) $$i" ; \
> $(MKDIR) $$i ; \
> done
> @@ -177,6 +179,15 @@ doc-html: doc/programmer/design/svn-desi
> doc-ps: doc/programmer/design/svn-design.ps doc/user/manual/svn-manual.ps
> doc-pdf: doc/programmer/design/svn-design.pdf doc/user/manual/svn-manual.pdf
>
> +doc-clean:
> + for f in doc/programmer/design/svn-design doc/user/manual/svn-manual;\
> + do \
> + rm -f $$f.info $$f.info-1 $$f.info-2 $$f.info-3 \
> + $$f.aux $$f.cp $$f.fn $$f.ky $$f.log $$f.pg $$f.toc \
> + $$f.tp $$f.vr \
> + $$f.dvi $$f.txt $$f.html $$f.ps $$f.pdf ;\
> + done
> +
> ### Build a tarball.
> dist:
> ./dist.sh
> @@ -200,16 +211,16 @@ dist:
>
> .texi.info:
> rm -f $@ $@-[0-9] $@-[0-9][0-9]
> - $(MAKEINFO) -I `dirname $(top_srcdir)/$<` -o $@ $<
> + $(MAKEINFO) -I `dirname $<` -o $@ $<
>
> .texi.dvi:
> - $(TEXI2DVI) -I `dirname $(top_srcdir)/$<` $<
> + wd=`pwd` ; cd `dirname $@` ; $(TEXI2DVI) -I `dirname $$wd/$<` $$wd/$<
>
> .texi.txt:
> - $(MAKEINFO) -I `dirname $(top_srcdir)/$<` --no-headers -o $@ $<
> + $(MAKEINFO) -I `dirname $<` --no-headers -o $@ $<
>
> .texi.html:
> - $(MAKEINFO) -I `dirname $(top_srcdir)/$<` --no-headers --html -o $@ $<
> + $(MAKEINFO) -I `dirname $<` --no-headers --html -o $@ $<
>
> .dvi.ps:
> $(DVIPS) $< -o $@
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: makefile patch.
Posted by "C. Scott Ananian" <ca...@lesser-magoo.lcs.mit.edu>.
OK, here's the fixed version of the 'make doc-*' patch. I added a
'doc-clean' target, while I was at it. I've tested this, and it does work
with
% mkdir BUILD
% ../configure --enable-maintainer-mode --srcdir=..
% make doc-pdf
enjoy...
--s
Pakistan Sugar Grove struggle Flintlock PLO Nazi Kennedy Bush DNC
IDEA planning East Timor munitions Kojarena Legion of Doom interception
( http://lesser-magoo.lcs.mit.edu/~cananian )
Index: Makefile.in
===================================================================
RCS file: /usr/local/tigris/data/helm/cvs/repository/subversion/Makefile.in,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile.in
--- Makefile.in 2001/08/15 00:23:24 1.27
+++ Makefile.in 2001/08/20 19:34:48
@@ -8,6 +8,8 @@ VPATH = @top_srcdir@
SVN_RA_LIB_DEPS = @SVN_RA_LIB_DEPS@
SVN_RA_LIB_LINK = @SVN_RA_LIB_LINK@
+DOC_DIRS = doc/programmer/design doc/user/manual
+
EXTERNAL_PROJECT_DIRS = neon apr @DB_SUBDIR@
SVN_APR_LIBS = @SVN_APR_LIBS@
@@ -133,7 +135,7 @@ check: $(TEST_DEPS)
fi
mkdir-init:
- @list='$(BUILD_DIRS)'; for i in $$list; do \
+ @list='$(BUILD_DIRS) $(DOC_DIRS)'; for i in $$list doc; do \
echo "$(MKDIR) $$i" ; \
$(MKDIR) $$i ; \
done
@@ -177,6 +179,15 @@ doc-html: doc/programmer/design/svn-desi
doc-ps: doc/programmer/design/svn-design.ps doc/user/manual/svn-manual.ps
doc-pdf: doc/programmer/design/svn-design.pdf doc/user/manual/svn-manual.pdf
+doc-clean:
+ for f in doc/programmer/design/svn-design doc/user/manual/svn-manual;\
+ do \
+ rm -f $$f.info $$f.info-1 $$f.info-2 $$f.info-3 \
+ $$f.aux $$f.cp $$f.fn $$f.ky $$f.log $$f.pg $$f.toc \
+ $$f.tp $$f.vr \
+ $$f.dvi $$f.txt $$f.html $$f.ps $$f.pdf ;\
+ done
+
### Build a tarball.
dist:
./dist.sh
@@ -200,16 +211,16 @@ dist:
.texi.info:
rm -f $@ $@-[0-9] $@-[0-9][0-9]
- $(MAKEINFO) -I `dirname $(top_srcdir)/$<` -o $@ $<
+ $(MAKEINFO) -I `dirname $<` -o $@ $<
.texi.dvi:
- $(TEXI2DVI) -I `dirname $(top_srcdir)/$<` $<
+ wd=`pwd` ; cd `dirname $@` ; $(TEXI2DVI) -I `dirname $$wd/$<` $$wd/$<
.texi.txt:
- $(MAKEINFO) -I `dirname $(top_srcdir)/$<` --no-headers -o $@ $<
+ $(MAKEINFO) -I `dirname $<` --no-headers -o $@ $<
.texi.html:
- $(MAKEINFO) -I `dirname $(top_srcdir)/$<` --no-headers --html -o $@ $<
+ $(MAKEINFO) -I `dirname $<` --no-headers --html -o $@ $<
.dvi.ps:
$(DVIPS) $< -o $@
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: makefile patch.
Posted by "C. Scott Ananian" <ca...@lesser-magoo.lcs.mit.edu>.
On Mon, 20 Aug 2001, C. Scott Ananian wrote:
> I'll play with this a bit.
yes, indeed: build_dir != src_dir is horribly broken. i'll have some
patches soon.
--s
Pakistan insurgent Cheney Hussein East Timor SEAL Team 6 Hawk Khaddafi
Hager Noriega assassination Rule Psix Bush early warning Shoal Bay
( http://lesser-magoo.lcs.mit.edu/~cananian )
--
"These students are going to have to find out what law and order is
all about." -- Brig. General Robert Canterbury, Noon, May 4, 1970,
minutes before his troops shot 13 unarmed Kent State students, killing 4.
--
[http://www.cs.cmu.edu/~dst/DeCSS/Gallery/]
#!/usr/bin/perl -w
# 526-byte qrpff, Keith Winstein and Marc Horowitz <si...@mit.edu>
# MPEG 2 PS VOB file on stdin -> descrambled output on stdout
# arguments: title key bytes in least to most-significant order
$_='while(read+STDIN,$_,2048){$a=29;$c=142;if((@a=unx"C*",$_)[20]&48){$h=5;
$_=unxb24,join"",@b=map{xB8,unxb8,chr($_^$a[--$h+84])}@ARGV;s/...$/1$&/;$d=
unxV,xb25,$_;$b=73;$e=256|(ord$b[4])<<9|ord$b[3];$d=$d>>8^($f=($t=255)&($d
>>12^$d>>4^$d^$d/8))<<17,$e=$e>>8^($t&($g=($q=$e>>14&7^$e)^$q*8^$q<<6))<<9
,$_=(map{$_%16or$t^=$c^=($m=(11,10,116,100,11,122,20,100)[$_/16%8])&110;$t
^=(72,@z=(64,72,$a^=12*($_%16-2?0:$m&17)),$b^=$_%64?12:0,@z)[$_%8]}(16..271))
[$_]^(($h>>=8)+=$f+(~$g&$t))for@a[128..$#a]}print+x"C*",@a}';s/x/pack+/g;eval
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: makefile patch.
Posted by "C. Scott Ananian" <ca...@lesser-magoo.lcs.mit.edu>.
On Mon, 20 Aug 2001, Greg Stein wrote:
> > .texi.dvi:
> > - $(TEXI2DVI) -I `dirname $(top_srcdir)/$<` $<
> > + cd `dirname $(top_srcdir)/$<` ; $(TEXI2DVI) -I . `basename $<`
> That isn't quite right. We want the output to be in the build directory, not
> the source directory. I think you'd want to cd to the build dir, then use
> the -I switch to point into the source directory. The output would be
> dropped there in the build dir.
ah, i forgot about build_dir != src_dir. In this case many of the given
rules are broken, as '$(top_srcdir)$<' is likely to be incorrect: $<
should have the path to the source directory already contained in it.
I'll play with this a bit.
--s
assassinate Hussein Nazi Diplomat Pakistan planning hack WTO Yakima
Secretary counter-intelligence quiche Clinton Ft. Meade President
( http://lesser-magoo.lcs.mit.edu/~cananian )
--
"These students are going to have to find out what law and order is
all about." -- Brig. General Robert Canterbury, Noon, May 4, 1970,
minutes before his troops shot 13 unarmed Kent State students, killing 4.
--
[http://www.cs.cmu.edu/~dst/DeCSS/Gallery/]
#!/usr/bin/perl -w
# 526-byte qrpff, Keith Winstein and Marc Horowitz <si...@mit.edu>
# MPEG 2 PS VOB file on stdin -> descrambled output on stdout
# arguments: title key bytes in least to most-significant order
$_='while(read+STDIN,$_,2048){$a=29;$c=142;if((@a=unx"C*",$_)[20]&48){$h=5;
$_=unxb24,join"",@b=map{xB8,unxb8,chr($_^$a[--$h+84])}@ARGV;s/...$/1$&/;$d=
unxV,xb25,$_;$b=73;$e=256|(ord$b[4])<<9|ord$b[3];$d=$d>>8^($f=($t=255)&($d
>>12^$d>>4^$d^$d/8))<<17,$e=$e>>8^($t&($g=($q=$e>>14&7^$e)^$q*8^$q<<6))<<9
,$_=(map{$_%16or$t^=$c^=($m=(11,10,116,100,11,122,20,100)[$_/16%8])&110;$t
^=(72,@z=(64,72,$a^=12*($_%16-2?0:$m&17)),$b^=$_%64?12:0,@z)[$_%8]}(16..271))
[$_]^(($h>>=8)+=$f+(~$g&$t))for@a[128..$#a]}print+x"C*",@a}';s/x/pack+/g;eval
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: makefile patch.
Posted by Greg Stein <gs...@lyra.org>.
On Mon, Aug 20, 2001 at 01:21:40PM -0400, C. Scott Ananian wrote:
> The 'make doc-dvi' target is broken: it puts the .dvi files in the
> subversion root directory instead of in the same directory as the source
> .dvi file. Appended is a patch to fix this (my first patch! whee!).
>...
> --- Makefile.in 2001/08/15 00:23:24 1.27
> +++ Makefile.in 2001/08/20 17:20:14
> @@ -203,7 +203,7 @@ dist:
> $(MAKEINFO) -I `dirname $(top_srcdir)/$<` -o $@ $<
>
> .texi.dvi:
> - $(TEXI2DVI) -I `dirname $(top_srcdir)/$<` $<
> + cd `dirname $(top_srcdir)/$<` ; $(TEXI2DVI) -I . `basename $<`
>
> .texi.txt:
> $(MAKEINFO) -I `dirname $(top_srcdir)/$<` --no-headers -o $@ $<
That isn't quite right. We want the output to be in the build directory, not
the source directory. I think you'd want to cd to the build dir, then use
the -I switch to point into the source directory. The output would be
dropped there in the build dir.
Cheers,
-g
--
Greg Stein, http://www.lyra.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org