Changeset cba9b3 in git


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • Makefile.am

    r5f6252 rcba9b3  
    1717install-data-local:
    1818        if test -e $(srcdir)/doc/doc.tbz2; then\
    19           (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(datadir)/singular; tar -jx --no-same-owner -f -));\
    20            mkdir $(DESTDIR)$(datadir)/info;\
    21            mkdir $(DESTDIR)$(datadir)/doc;\
    22            mv  $(DESTDIR)$(datadir)/singular/singular.info  $(DESTDIR)$(datadir)/info/.;\
     19           test -e $(DESTDIR)$(datadir) || mkdir -p $(DESTDIR)$(datadir);\
     20           test -e $(DESTDIR)$(datadir)/info || mkdir $(DESTDIR)$(datadir)/info;\
     21           test -e $(DESTDIR)$(datadir)/singular || mkdir $(DESTDIR)$(datadir)/singular;\
     22           test -e $(DESTDIR)$(htmldir) || mkdir -p $(DESTDIR)$(htmldir);\
     23           (cat ${top_srcdir}/doc/doc.tbz2| (cd $(DESTDIR)$(htmldir);tar -jx --no-same-owner -f -));\
     24           mv  $(DESTDIR)$(htmldir)/singular.info  $(DESTDIR)$(datadir)/info/.;\
     25           mv  $(DESTDIR)$(htmldir)/singular.idx  $(DESTDIR)$(datadir)/singular/.;\
    2326        fi
    2427
  • Singular/Makefile.am

    r5f6252 rcba9b3  
    144144dist_man1_MANS = Singular.man ESingular.man TSingular.man
    145145
    146 EXTRA_PROGRAMS =  libparse Singulard
     146EXTRA_PROGRAMS =  libparse
    147147
    148148# the "optional_Singular_programs" variable should be defined in the configure
     
    156156
    157157Singular_LDFLAGS = ${AM_LDFLAGS} ${BUILTIN_FLAGS}
    158 
    159 Singulard_SOURCES = tesths.cc utils.cc  utils.h
    160 
    161 Singulard_LDADD = libSingular.la ${BUILTIN_FLAGS}
    162 
    163 Singulard_LDFLAGS = -shared ${AM_LDFLAGS} ${BUILTIN_FLAGS}
    164158
    165159scriptdir = $(libexecdir)/singular/MOD
  • doc/Makefile.am

    r5f6252 rcba9b3  
    188188        $(MAKE) -j1 -f Makefile-docbuild singular.info html
    189189        chmod -R a+rX singular.info html
    190         $(AMTAR) jcf $@ singular.info html
     190        cp singular.info singular.idx html
     191        (cd html;$(AMTAR) jcf ../$@ *)
    191192dist-hook:
    192193        @if [ -n "$(DOC2TEX_EXAMPLE_EXCLUSIONS)" ]; then                                        \
  • m4/options.m4

    r5f6252 rcba9b3  
    174174
    175175  if test "x$htmldir" = "x\${docdir}"; then
    176     DEFAULT_HTMLDIR="--htmldir=$datarootdir/singular/html"
     176    DEFAULT_HTMLDIR="--htmldir=$datarootdir/doc/singular"
    177177  fi
    178178
Note: See TracChangeset for help on using the changeset viewer.