aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.in4
-rwxr-xr-xautogen.sh3
-rw-r--r--configure.ac2
-rwxr-xr-xdists/autogen/autogen.sh9
4 files changed, 5 insertions, 13 deletions
diff --git a/Makefile.in b/Makefile.in
index 334a5bc7..f27d0af5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -61,8 +61,6 @@ USDX_LIB_DIR := $(USDX_SRC_DIR)/lib
INSTALL_DATADIR := $(datadir)/$(USDX_PACKAGE_NAME)
-AUTOGEN_DIR := $(srcdir)/dists/autogen
-
#################################################
# Binary name
#################################################
@@ -186,7 +184,7 @@ config.status: configure
.PHONE: reconf
reconf:
- $(AUTOGEN_DIR)/autogen.sh
+ ./autogen.sh
#################################################
# install/uninstall
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 00000000..8f551bff
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+AUTOGEN_DIR=dists/autogen
+aclocal -I ${AUTOGEN_DIR}/m4 && autoconf
diff --git a/configure.ac b/configure.ac
index 2a0bc83a..877264f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
#
# by UltraStar Deluxe Team
#
-# Execute "dists/autogen/autogen.sh" or "make reconf"
+# Execute "autogen.sh" or "make reconf"
# to create the configure script.
#
# Helper macros have been separated to
diff --git a/dists/autogen/autogen.sh b/dists/autogen/autogen.sh
deleted file mode 100755
index fdecccd9..00000000
--- a/dists/autogen/autogen.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-# find absolute dists/autogen and project-root dirs
-AUTOGEN_DIR=`dirname $0`
-ABS_AUTOGEN_DIR=`cd ${AUTOGEN_DIR}; pwd`
-ROOT_DIR="${AUTOGEN_DIR}/../.."
-ABS_ROOT_DIR=`cd ${ROOT_DIR}; pwd`
-# change to project-root and create configure-script
-cd ${ROOT_DIR}
-aclocal -I "${ABS_AUTOGEN_DIR}/m4" && autoconf && echo "configure created in ${ABS_ROOT_DIR}"