reorganize: vlna-1.5 plus vlna-1.5-PATCHES

git-svn-id: svn://tug.org/texlive/trunk@22301 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 21 insertions, 19 deletions

diff --git a/Build/source/utils/vlna/Makefile.in b/Build/source/utils/vlna/Makefile.in
index 094cd4a38cd..1f2a8f1587d 100644
--- a/Build/source/utils/vlna/Makefile.in
+++ b/Build/source/utils/vlna/Makefile.in
@@ -34,8 +34,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 bin_PROGRAMS = vlna$(EXEEXT)
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(dist_man1_MANS) \
-	$(srcdir)/../../build-aux/depcomp \
+DIST_COMMON = $(am__configure_deps) $(srcdir)/../../build-aux/depcomp \
 	$(srcdir)/../../build-aux/install-sh \
 	$(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(top_srcdir)/configure \
@@ -91,7 +90,7 @@ am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 man1dir = $(mandir)/man1
 NROFF = nroff
-MANS = $(dist_man1_MANS)
+MANS = $(man1_MANS)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -150,6 +149,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+VLNA_TREE = @VLNA_TREE@
 WARNING_CFLAGS = @WARNING_CFLAGS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -194,14 +194,9 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I ../../m4
+EXTRA_DIST = $(VLNA_TREE) $(VLNA_TREE)-PATCHES
 AM_CFLAGS = $(WARNING_CFLAGS)
-dist_man1_MANS = vlna.man
-CWEB_SRC = vlna.w
-CSMAC = csmac.tex
-CWEB_TEX = vlna.tex vlna.idx vlna.scn
-CWEB_DVI = vlna.dvi
-DOCS = README README.en vlna.txt vlna-cz.man
-EXTRA_DIST = $(CWEB_SRC) $(CSMAC) $(CWEB_TEX) $(CWEB_DVI) $(DOCS)
+man1_MANS = $(VLNA_TREE)/vlna.man
 CLEANFILES = vlna.log vlna.toc
 all: all-am
 
@@ -303,10 +298,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-install-man1: $(dist_man1_MANS)
+install-man1: $(man1_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
 	{ for i in $$list; do echo "$$i"; done; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
@@ -330,7 +325,7 @@ install-man1: $(dist_man1_MANS)
 
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
 	files=`{ for i in $$list; do echo "$$i"; done; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
@@ -435,6 +430,9 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
+	$(MAKE) $(AM_MAKEFLAGS) \
+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
+	  dist-hook
 	-test -n "$(am__skip_mode_fix)" \
 	|| find "$(distdir)" -type d ! -perm -755 \
 		-exec chmod u+rwx,go+rx {} \; -o \
@@ -661,8 +659,8 @@ uninstall-man: uninstall-man1
 
 .PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-am \
 	clean clean-binPROGRAMS clean-generic ctags dist dist-all \
-	dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-xz \
-	dist-zip distcheck distclean distclean-compile \
+	dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar dist-tarZ \
+	dist-xz dist-zip distcheck distclean distclean-compile \
 	distclean-generic distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
 	install install-am install-binPROGRAMS install-data \
@@ -677,21 +675,25 @@ uninstall-man: uninstall-man1
 	uninstall-man1
 
 
+# in case of an SVN repository
+dist-hook:
+	rm -rf `find $(distdir) -name .svn`
+
 vlna.dvi: vlna.tex vlna.idx vlna.scn
-	TEXINPUTS=.:$(srcdir):$$TEXINPUTS $(CSPLAIN) vlna.tex
+	TEXINPUTS=.:$(srcdir)/$(VLNA_TREE):$$TEXINPUTS $(CSPLAIN) vlna.tex
 
 # Running cweave in order to create vlna.tex generates in addition
 # vlna.idx and vlna.scn; we must rerun cweave when they are not
 # up to date (even if vlna.tex is up to date). Thus the sub-make.
 #
-vlna.tex vlna.idx vlna.scn: vlna.w
+vlna.tex vlna.idx vlna.scn: $(VLNA_TREE)/vlna.w
 	$(MAKE) $(AM_MAKEFLAGS) do-cweave
-do-cweave: vlna.w .FORCE
+do-cweave: $(VLNA_TREE)/vlna.w .FORCE
 	$(CWEAVE) $<
 .PHONY: do-cweave .FORCE
 
 @do_cweb_TRUE@all-local: vlna.dvi
-@do_cweb_TRUE@vlna.c: vlna.w
+@do_cweb_TRUE@vlna.c: $(VLNA_TREE)/vlna.w
 @do_cweb_TRUE@	$(CTANGLE) $<
 @do_cweb_FALSE@all-local: