Commit 79f4735e authored by jhugues's avatar jhugues

* Detect GNU Sed whenever possible, for ticket 285



git-svn-id: https://tecsw.estec.esa.int/svn/taste/trunk/ocarina@3871 129961e7-ef38-4bb5-a8f7-c9a525a55882
parent 706a49eb
...@@ -31,6 +31,22 @@ AC_CHECK_PROG(GNATLS, gnatls, gnatls) ...@@ -31,6 +31,22 @@ AC_CHECK_PROG(GNATLS, gnatls, gnatls)
AC_EXEEXT AC_EXEEXT
AM_PATH_PYTHON AM_PATH_PYTHON
dnl we need a GNU flavoured sed
AC_CHECK_PROG(HAVE_GNUSED,gnused,yes,no)
AC_CHECK_PROG(HAVE_GSED,gsed,yes,no)
AC_CHECK_PROG(HAVE_SED,sed,yes,no)
if test "$HAVE_GNUSED" = yes; then
SED=gnused
else
if test "$HAVE_GSED" = yes; then
SED=gsed
else
SED=sed
fi
fi
AC_SUBST(SED)
########################################## ##########################################
# Check for the path kind used by GNAT # Check for the path kind used by GNAT
########################################## ##########################################
......
...@@ -70,7 +70,7 @@ install-data-local: ...@@ -70,7 +70,7 @@ install-data-local:
echo -n "s/OCARINA_INCLUDE_PATH/" > sedscript echo -n "s/OCARINA_INCLUDE_PATH/" > sedscript
echo -n $(DESTDIR)$(includedir)|sed -e 's/\//\\\//g' >> sedscript echo -n $(DESTDIR)$(includedir)|sed -e 's/\//\\\//g' >> sedscript
echo -n "/g" >> sedscript echo -n "/g" >> sedscript
sed -f sedscript $(DESTDIR)$(datadir)/ocarina/AADLv2/ocarina_components.aadl > tmp.aadl $(SED) -f sedscript $(DESTDIR)$(datadir)/ocarina/AADLv2/ocarina_components.aadl > tmp.aadl
mv -f tmp.aadl $(DESTDIR)$(datadir)/ocarina/AADLv2/ocarina_components.aadl mv -f tmp.aadl $(DESTDIR)$(datadir)/ocarina/AADLv2/ocarina_components.aadl
for file in $(MODE_FILES); do \ for file in $(MODE_FILES); do \
$(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/ocarina || exit 1; \ $(INSTALL_DATA) $$file $(DESTDIR)$(datadir)/ocarina || exit 1; \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment