Skip to content

Commit a04c2fd

Browse files
committed
Simplify autogen.sh using autoreconf only
Add AC_CONFIG_AUX_DIR([config]) to configure.ac AM_INIT_AUTOMAKE after AC_CONFIG_AUX_DIR to avoid one error in autotools Not add foreign to AM_INIT_AUTOMAKE, instead add subdir-objects Use symlinks to required files: Makefile.am: error: required file './AUTHORS' not found Makefile.am: error: required file './ChangeLog' not found Makefile.am: installing './COPYING' using GNU General Public License v3 file
1 parent 80fd97d commit a04c2fd

File tree

3 files changed

+11
-44
lines changed

3 files changed

+11
-44
lines changed

autogen.sh

Lines changed: 8 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -35,50 +35,17 @@ if expr "$confver" \> "$gettext_version" >/dev/null; then
3535
exit 1
3636
fi
3737

38-
# Force intl regenration to get last update from installed gettext templates
39-
rm -rf intl/*
40-
#if [ ! -d intl ]; then
41-
echo "Setting up internationalization files."
42-
autopoint --force
43-
if grep -q datarootdir po/Makefile.in.in; then
44-
echo autopoint honors dataroot variable, not patching.
45-
else
46-
echo autopoint does not honor dataroot variable, patching.
47-
sed -e '/^datadir *=/a\
48-
datarootdir = @datarootdir@' po/Makefile.in.in > po/Makefile.in.in.tmp && mv -f po/Makefile.in.in.tmp po/Makefile.in.in
49-
sed -e '/^datadir *=/a\
50-
datarootdir = @datarootdir@' intl/Makefile.in > intl/Makefile.in.tmp && mv -f intl/Makefile.in.tmp intl/Makefile.in
51-
fi
52-
UNAME=`uname`
53-
if [ x$UNAME = x"Darwin" ]; then
54-
echo Not patching po/Makefile.in.in - sed is too old.
55-
else
56-
sed -e '/^clean:/a\
57-
rm -f *.gmo' po/Makefile.in.in > po/Makefile.in.in.tmp && mv -f po/Makefile.in.in.tmp po/Makefile.in.in
58-
fi
59-
# if [ -f Makefile -a -x config.status ]; then
60-
# CONFIG_FILES=intl/Makefile CONFIG_HEADERS= /bin/sh ./config.status
61-
# fi
62-
# gettextize --intl -f --no-changelog
63-
# echo "restoring Makefile.am and configure.ac"
64-
# cp -f Makefile.am~ Makefile.am
65-
# cp -f configure.ac~ configure.ac
66-
#fi
67-
68-
echo "Running aclocal -I m4"
69-
aclocal -I m4
70-
71-
echo "Running autoheader"
72-
autoheader
73-
74-
echo "Running autoconf"
75-
autoconf
76-
7738
echo "Creating pixmaps Makefile.am"
7839
OLDPWD="`pwd`"
7940
cd src/pixmaps/flags_xpm
8041
./makeflags.sh
8142
cd "$OLDPWD"
8243

83-
echo "Running automake --foreign -a -c -f"
84-
automake --foreign -a -c -f
44+
touch NEWS
45+
ln -s docs/README
46+
ln -s docs/AUTHORS
47+
ln -s docs/Changelog ChangeLog
48+
ln -s docs/COPYING
49+
50+
echo "Running autoreconf --install"
51+
autoreconf --install

configure.ac

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,15 @@
2525
#
2626

2727
AC_INIT([aMule],[SVN],[[email protected]])
28-
AM_INIT_AUTOMAKE
2928
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
3029

3130
AC_PREREQ(2.59)
3231

3332
AC_CONFIG_SRCDIR([src/amule.cpp])
3433
AC_CONFIG_HEADERS([config.h])
3534
AC_CONFIG_MACRO_DIR([m4])
35+
AC_CONFIG_AUX_DIR([config])
36+
AM_INIT_AUTOMAKE([subdir-objects])
3637
AM_MAINTAINER_MODE
3738

3839
dnl Check host system.

docs/Makefile.am

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
SUBDIRS = man
22

33
dist_doc_DATA = \
4-
ABOUT-NLS \
54
amulesig.txt \
65
Changelog \
76
INSTALL \
8-
license.txt \
7+
COPYING \
98
README \
109
TODO \
1110
EC_Protocol.txt

0 commit comments

Comments
 (0)