Changeset cba9b3 in git

Timestamp:

Jun 23, 2022, 1:26:26 PM (7 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '2234726c50d679d6664181a5c72f75a6fd64a787')

Children:

306b2992d264f1dd1853f31ef0f93800fc2cc119

Parents:

5f62529a0524e7312ffb6cce8cbca0e26c513a56

Message:

apapt to --htmdir option to configure, build a different doc.tbz2

Files:

• Makefile.am (modified) (1 diff)
• Singular/Makefile.am (modified) (2 diffs)
• doc/Makefile.am (modified) (1 diff)
• m4/options.m4 (modified) (1 diff)

Makefile.am

@@ -17 +17 @@
 install-data-local:
         if test -e $(srcdir)/doc/doc.tbz2; then\
-          (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; tar -jx --no-same-owner -f -));\
-           mkdir $(DESTDIR)$(datadir)/info;\
-           mkdir $(DESTDIR)$(datadir)/doc;\
-           mv  $(DESTDIR)$(datadir)/singular/singular.info  $(DESTDIR)$(datadir)/info/.;\
+           test -e $(DESTDIR)$(datadir) || mkdir -p $(DESTDIR)$(datadir);\
+           test -e $(DESTDIR)$(datadir)/info || mkdir $(DESTDIR)$(datadir)/info;\
+           test -e $(DESTDIR)$(datadir)/singular || mkdir $(DESTDIR)$(datadir)/singular;\
+           test -e $(DESTDIR)$(htmldir) || mkdir -p $(DESTDIR)$(htmldir);\
+           (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(htmldir);tar -jx --no-same-owner -f -));\
+           mv  $(DESTDIR)$(htmldir)/singular.info  $(DESTDIR)$(datadir)/info/.;\
+           mv  $(DESTDIR)$(htmldir)/singular.idx  $(DESTDIR)$(datadir)/singular/.;\
         fi
 

Singular/Makefile.am

@@ -144 +144 @@
 dist_man1_MANS = Singular.man ESingular.man TSingular.man
 
-EXTRA_PROGRAMS =  libparse Singulard
+EXTRA_PROGRAMS =  libparse
 
 # the "optional_Singular_programs" variable should be defined in the configure
@@ -156 +156 @@
 
 Singular_LDFLAGS = ${AM_LDFLAGS} ${BUILTIN_FLAGS}
-
-Singulard_SOURCES = tesths.cc utils.cc  utils.h
-
-Singulard_LDADD = libSingular.la ${BUILTIN_FLAGS}
-
-Singulard_LDFLAGS = -shared ${AM_LDFLAGS} ${BUILTIN_FLAGS}
 
 scriptdir = $(libexecdir)/singular/MOD

doc/Makefile.am

@@ -188 +188 @@
         $(MAKE) -j1 -f Makefile-docbuild singular.info html
         chmod -R a+rX singular.info html
-        $(AMTAR) jcf $@ singular.info html
+        cp singular.info singular.idx html
+        (cd html;$(AMTAR) jcf ../$@ *)
 dist-hook:
         @if [ -n "$(DOC2TEX_EXAMPLE_EXCLUSIONS)" ]; then                                        \

m4/options.m4

@@ -174 +174 @@
 
   if test "x$htmldir" = "x\${docdir}"; then 
-    DEFAULT_HTMLDIR="--htmldir=$datarootdir/singular/html"
+    DEFAULT_HTMLDIR="--htmldir=$datarootdir/doc/singular"
   fi