[xml/sgml-commit] [SCM] linuxdoc-tools package for Debian. branch, experimental, updated. debian/0.9.56-3-g5e12f87

[Agustin Martin Domingo]

The following commit has been merged in the experimental branch:
commit 2d5838ca0ca93d5da83325f3622f2d674d36fd5c
Author: Agustin Martin Domingo <agmartin at debian.org>
Date:   Tue Jul 8 20:55:44 2008 +0200

    Move tex stuff in sources to a tex directory. Modify install accordingly.
    
    * Improve tex stuff handling
      - Move tex stuff in sources to an explicit tex directory.
      - Makefile.in: Install tex stuff from Makefile where specified by $(texdir).
      - debian/rules: no longer install TeX stuff here. Set tex target
        through $(texdir) in install target.
    * Makefile.in, debian/rules: Cosmetic changes.

diff --git a/Makefile.in b/Makefile.in
index 149e472..3eeacce 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,27 +4,28 @@
 #  Copyright (C) 1996 Sven Rudolph
 #  Copyright (C) 2008 Agustin Martin
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-datadir=@datadir@
-pkgdatadir=$(datadir)/linuxdoc-tools
-LINUXDOCDOC=$(prefix)/share/doc/linuxdoc-tools
-mandir=@mandir@
-mandir1=$(mandir)/man1
-PERL=@PERL@
-
-INSTALL=@INSTALL@
-INSTALL_PROGRAM=@INSTALL_PROGRAM@ -m 755
-INSTALL_DATA=@INSTALL_DATA@
+prefix      = @prefix@
+exec_prefix = @exec_prefix@
+bindir      = @bindir@
+datadir     = @datadir@
+pkgdatadir  = $(datadir)/linuxdoc-tools
+LINUXDOCDOC = $(prefix)/share/doc/linuxdoc-tools
+mandir      = @mandir@
+mandir1     = $(mandir)/man1
+texdir      = $(pkgdatadir)
+PERL        = @PERL@
+
+INSTALL         = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ -m 755
+INSTALL_DATA    = @INSTALL_DATA@
 
 #
 # nsgmls or onsgmls should be installed already
 # BUILD_NSGMLS=@BUILD_NSGMLS@
 
-BUILD_SGMLSASP=@BUILD_SGMLSASP@
-BUILD_ENTITY_MAP=@BUILD_ENTITY_MAP@
-BUILD_ISO_ENTITIES=@BUILD_ISO_ENTITIES@
+BUILD_SGMLSASP     = @BUILD_SGMLSASP@
+BUILD_ENTITY_MAP   = @BUILD_ENTITY_MAP@
+BUILD_ISO_ENTITIES = @BUILD_ISO_ENTITIES@
 
 GENFILES := bin/linuxdoc
 progs    := sgml2html sgml2info sgml2latex sgml2lyx sgml2rtf sgml2txt sgmlcheck
@@ -129,6 +130,10 @@ endif
 	find $(LINUXDOCDOC) -type d -print | xargs chmod 755
 	find $(LINUXDOCDOC) -type f -print | xargs chmod 644
 
+#    -- Install tex stuff
+	mkdir -p $(texdir)
+	$(INSTALL_DATA) tex/* $(texdir)
+
 # what dirs do the targets clean and distclean need?
 DDIRS=
 MDIRS=
diff --git a/debian/rules b/debian/rules
index 1d41cf6..9b9bc37 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,14 @@
 #!/usr/bin/make -f
 
-SHELL=/bin/bash
+SHELL     = /bin/bash
 
-package=linuxdoc-tools
+package   = linuxdoc-tools
 
 # for FHS transition
-DOCDIR=usr/share/doc/$(package)
-MANDIR=usr/share/man
-INFODIR=usr/share/info
-copyright=debian/$(package).copyright
+DOCDIR    = usr/share/doc/$(package)
+MANDIR    = usr/share/man
+INFODIR   = usr/share/info
+copyright = debian/$(package).copyright
 
 # create linuxdoc-tools copyright file by merging some files
 
@@ -86,7 +86,9 @@ install: build
 		perl5libdir=`pwd`/debian/tmp/usr/share/perl5 \
 		PERL=/usr/bin/perl \
 		mandir=`pwd`/debian/tmp/usr/share/man \
-		bindir=`pwd`/debian/tmp/usr/bin install
+		bindir=`pwd`/debian/tmp/usr/bin \
+		texdir=`pwd`/debian/tmp/usr/share/texmf/tex/latex/misc \
+		install
 
 # --- Install shell scripts for sgml2{txt,latex,info}
 	for i in txt latex info; do \
@@ -107,11 +109,6 @@ install: build
 # ---
 	mkdir -p debian/tmp/usr/share/sgml
 	( cd debian/tmp/usr/share/linuxdoc-tools && mv dtd ../sgml )
-# ---
-	mkdir -p debian/tmp/usr/share/texmf/tex/latex/misc
-	( cd debian/tmp/usr/share/linuxdoc-tools && \
-		mv {linuxdoc-sgml,linuxdoctr-sgml,qwertz,null}.sty \
-			../texmf/tex/latex/misc )
 
 binary-indep:
 	dh_testdir -i
diff --git a/lib/linuxdoc-sgml.sty b/tex/linuxdoc-sgml.sty
similarity index 100%
rename from lib/linuxdoc-sgml.sty
rename to tex/linuxdoc-sgml.sty
diff --git a/lib/linuxdoctr-sgml.sty b/tex/linuxdoctr-sgml.sty
similarity index 100%
rename from lib/linuxdoctr-sgml.sty
rename to tex/linuxdoctr-sgml.sty
diff --git a/lib/null.sty b/tex/null.sty
similarity index 100%
rename from lib/null.sty
rename to tex/null.sty
diff --git a/lib/qwertz.sty b/tex/qwertz.sty
similarity index 100%
rename from lib/qwertz.sty
rename to tex/qwertz.sty

-- 
linuxdoc-tools package for Debian.