* attila/src/Makefile.am,

attila/src/attila.sh,
   attila/etc/attila.conf :
   - Le "sed" dans le Makefile.am etait trop violent : consequence attila
       se croyait toujours en etat d'auto-installation et ne lisait jamais
       "attila.conf".
   - Dans load_conf (attila.conf) on fesait tout les tests mais j'avais
       completement oublie de charger le fichier si c'est OK (la c'est
       vraiment minable).
   - Dans attila.conf, j'oubliais de checkouter "alliance/src/configure.in"
       donc, pour le premier outil on partait aux fraises.
This commit is contained in:
Jean-Paul Chaput 2002-10-04 14:06:28 +00:00
parent 73adb06ff6
commit 4a184a7952
3 changed files with 12 additions and 4 deletions

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# $Id: attila.conf,v 1.3 2002/09/30 18:30:05 jpc Exp $ # $Id: attila.conf,v 1.4 2002/10/04 14:06:24 jpc Exp $
# #
# -*- Mode: Shell-script -*- # -*- Mode: Shell-script -*-
# #
@ -53,4 +53,11 @@
CVS_STARTUP_FILES="$CVS_STARTUP_FILES alliance.m4" CVS_STARTUP_FILES="$CVS_STARTUP_FILES alliance.m4"
CVS_STARTUP_FILES="$CVS_STARTUP_FILES motif.m4" CVS_STARTUP_FILES="$CVS_STARTUP_FILES motif.m4"
CVS_STARTUP_FILES="$CVS_STARTUP_FILES xpm.m4" CVS_STARTUP_FILES="$CVS_STARTUP_FILES xpm.m4"
CVS_STARTUP_FILES="$CVS_STARTUP_FILES configure.in"
CVS_STARTUP_FILES="$CVS_STARTUP_FILES Makefile.am" CVS_STARTUP_FILES="$CVS_STARTUP_FILES Makefile.am"
#CVS_STARTUP_FILES="$CVS_STARTUP_FILES install.sh"
#CVS_STARTUP_FILES="$CVS_STARTUP_FILES mkinstalldirs"
#CVS_STARTUP_FILES="$CVS_STARTUP_FILES missing"
#CVS_STARTUP_FILES="$CVS_STARTUP_FILES config.guess"
#CVS_STARTUP_FILES="$CVS_STARTUP_FILES config.sub"
#CVS_STARTUP_FILES="$CVS_STARTUP_FILES ltmain.sh"

View File

@ -4,8 +4,7 @@ bin_SCRIPTS = attila
CLEANFILES = attila CLEANFILES = attila
attila : ${srcdir}/attila.sh attila : ${srcdir}/attila.sh
${SED} 's,__ALLIANCE_INSTALL_DIR__,$(prefix),' $< > $@ ${SED} 's,="__ALLIANCE_INSTALL_DIR__"$$,="$(prefix)",' $< > $@
chmod a+x $@
EXTRA_DIST = attila.sh EXTRA_DIST = attila.sh

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# $Id: attila.sh,v 1.4 2002/10/01 14:02:11 jpc Exp $ # $Id: attila.sh,v 1.5 2002/10/04 14:06:28 jpc Exp $
# #
# /------------------------------------------------------------------\ # /------------------------------------------------------------------\
# | | # | |
@ -226,6 +226,8 @@
exit 1 exit 1
fi fi
. "$ALLIANCE_TOP/etc/attila.conf"
} }