buildsys  Check-in [a6dcdabef7]

Overview
Comment:Use PACKAGE_NAME and PACKAGE_VERSION.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: a6dcdabef7b236b508f0e3c81479c362640025ed79d316226c05274ef68163fc
User & Date: js on 2012-03-21 12:13:25
Other Links: manifest | tags
Context
2012-03-21
20:28
OS X: Only add -install_name after installation. check-in: 47b4ff074b user: js tags: trunk
12:13
Use PACKAGE_NAME and PACKAGE_VERSION. check-in: a6dcdabef7 user: js tags: trunk
12:13
Update URL in copyright. check-in: a8598f9e8f user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified buildsys.mk.in from [29561c011f] to [c1236492e2].

︙
17
18
19
20
21
22
23
24


25
26
27
28
29
30
31

17
18
19
20
21
22
23

24
25
26
27
28
29
30
31
32








-
+
+








#  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
#  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
#  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
#  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
#  POSSIBILITY OF SUCH DAMAGE.
#

PACKAGE = @PACKAGE@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
AS = @AS@
CC = @CC@
CXX = @CXX@
CPP = @CPP@
DC = @DC@
ERLC = @ERLC@
OBJC = @OBJC@
︙
68
69
70
71
72
73
74
75

76
77
78
79

80
81

82
83
84
85
86
87
88

69
70
71
72
73
74
75

76
77
78
79

80
81

82
83
84
85
86
87
88
89








-
+



-
+

-
+








JAVACFLAGS = @JAVACFLAGS@
JAR = @JAR@
WINDRES = @WINDRES@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
libdir = @libdir@
plugindir ?= ${libdir}/${PACKAGE}
plugindir ?= ${libdir}/${PACKAGE_NAME}
datarootdir = @datarootdir@
datadir = @datadir@
includedir = @includedir@
includesubdir ?= ${PACKAGE}
includesubdir ?= ${PACKAGE_NAME}
localedir = @localedir@
localename ?= ${PACKAGE}
localename ?= ${PACKAGE_NAME}
mandir = @mandir@
mansubdir ?= man1

OBJS1 = ${SRCS:.c=.o}
OBJS2 = ${OBJS1:.cc=.o}
OBJS3 = ${OBJS2:.cxx=.o}
OBJS4 = ${OBJS3:.d=.o}
︙
538
539
540
541
542
543
544
545

546
547
548
549
550
551
552

539
540
541
542
543
544
545

546
547
548
549
550
551
552
553








-
+








		else \
			${INSTALL_FAILED}; \
		fi \
	done

	for i in ${DATA}; do \
		${INSTALL_STATUS}; \
		if ${MKDIR_P} $$(dirname ${DESTDIR}${datadir}/${PACKAGE}/$$i) && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \
		if ${MKDIR_P} $$(dirname ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i) && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i; then \
			${INSTALL_OK}; \
		else \
			${INSTALL_FAILED}; \
		fi \
	done

	for i in ${PROG}; do \
︙
622
623
624
625
626
627
628
629
630


631
632
633
634
635
636

637
638

639
640
641
642
643
644
645

623
624
625
626
627
628
629


630
631
632
633
634
635
636

637
638

639
640
641
642
643
644
645
646








-
-
+
+





-
+

-
+








				${DELETE_FAILED}; \
			fi \
		fi \
	done
	-rmdir ${DESTDIR}${plugindir} >/dev/null 2>&1

	for i in ${DATA}; do \
		if test -f ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \
			if rm -f ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \
		if test -f ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i; then \
			if rm -f ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i; then \
				${DELETE_OK}; \
			else \
				${DELETE_FAILED}; \
			fi \
		fi; \
		rmdir "$$(dirname ${DESTDIR}${datadir}/${PACKAGE}/$$i)" >/dev/null 2>&1 || true; \
		rmdir "$$(dirname ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i)" >/dev/null 2>&1 || true; \
	done
	-rmdir ${DESTDIR}${datadir}/${PACKAGE} >/dev/null 2>&1
	-rmdir ${DESTDIR}${datadir}/${PACKAGE_NAME} >/dev/null 2>&1

	for i in ${PROG}; do \
		if test -f ${DESTDIR}${bindir}/$$i; then \
			if rm -f ${DESTDIR}${bindir}/$$i; then \
				${DELETE_OK}; \
			else \
				${DELETE_FAILED}; \
︙

Modified configure.ac from [765a32b9bb] to [c083ddcb6a].

︙
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56

39
40
41
42
43
44
45




46
47
48
49
50
51
52








-
-
-
-








dnl BUILDSYS_PROG_IMPLIB

dnl We need this in order to run some initialization needed by the buildsys
BUILDSYS_INIT
dnl You need to call this to generate the .deps files required by the buildsys.
BUILDSYS_TOUCH_DEPS

dnl Set the name of your package here. It will be used in the default include
dnl paths for example. (Can be changed, see buildsys.mk.in for details.)
AC_SUBST(PACKAGE, name)

dnl If you don't need any extra variables
AC_CONFIG_FILES(buildsys.mk)
dnl If you need any extra variables, they go to extra.mk.
dnl If you use extra variables, comment the line above and uncomment the line
dnl below.
dnl AC_CONFIG_FILES([buildsys.mk extra.mk])
︙