Skip to content
Snippets Groups Projects
Commit 4198f254 authored by Christian Engwer's avatar Christian Engwer
Browse files

make buildsystem work with mac os x (fix 387)

[[Imported from SVN: r5211]]
parent e298331f
Branches
Tags
No related merge requests found
......@@ -6,6 +6,7 @@ if BUILD_DOCS
# EXTRAINSTALL in the html subdirectory
DOXYGENHTMLFILES = *.html *.css *.png *.gif
# DOXYGENDISTFILES = html html/*.html html/*.css html/*.png html/*.gif doxygen-tag
DOXYGENDISTFILES =
DOXYGENINSTALL = $(DOXYGENHTMLFILES) ../doxygen.log
endif
......@@ -77,10 +78,10 @@ web-install-doxygen:
EXTRAINSTALL="$(DOXYGENINSTALL)" CURDIR="$(CURDIR)/@DUNE_MOD_NAME@-html" install ; \
popd; \
fi
web-install: web-install-doxygen
endif
web-install: web-install-doxygen web-install-default
clean-local: clean-doxygen
clean-doxygen:
......
......@@ -11,12 +11,14 @@
# pass files through wrapper
# pass variables to wmlwrap via environment
if WML
.wml.html:
export DUNEWEBDIR=$(DUNEWEBDIR); \
export BASEDIR=$(BASEDIR); \
sh $(DUNE_COMMON_ROOT)/bin/wmlwrap -I $(srcdir) $< -o $@
web-install: all
web-install-default: all
if test -d $(DUNEWEBDIR) && test -r $(DUNEWEBDIR)/Make.global ; then \
for DIR in $(SUBDIRS) ; do \
$(MAKE) -C $$DIR web-install || exit 1; \
......@@ -24,3 +26,7 @@ web-install: all
$(MAKE) -f $(DUNEWEBDIR)/Make.global \
EXTRAINSTALL="$(EXTRAINSTALL)" CURDIR="$(CURDIR)" install ; \
fi
endif
web-install: web-install-default
......@@ -99,7 +99,7 @@ dunecontrol --only=$name m4create
echo "--> aclocal..."
rm -f aclocal.m4
rm -rf autom4te.cache
aclocal$AMVERSION -I. $ACLOCAL_FLAGS
aclocal$AMVERSION -I . $ACLOCAL_FLAGS
# create a link to the dune-common am directory
if [ "$name" != "dune-common" ]; then
......@@ -120,7 +120,7 @@ echo "--> autoheader..."
autoheader$ACVERSION
echo "--> automake..."
automake$AMVERSION --add-missing
automake$AMVERSION -W all --add-missing
echo "--> autoconf..."
autoconf$ACVERSION
......
......@@ -3,6 +3,7 @@
# setting like in dune-web
BASEDIR=../..
CURDIR=doc/doxygen
WHAT=
if BUILD_DOCS
if WML
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment