1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-03 06:04:53 +00:00
freebsd-ports/cad/magic/files/patch-Makefile
Martin Wilke 55b3cd6fc6 - Update to 7.5.124
PR:		164986
Submitted by:	Ports Fury
2012-02-19 23:25:01 +00:00

84 lines
2.5 KiB
Plaintext

--- Makefile.orig 2012-01-17 02:17:06.000000000 +0900
+++ Makefile 2012-01-17 02:18:32.000000000 +0900
@@ -18,12 +18,10 @@
all: $(ALL_TARGET)
standard:
- @echo --- errors and warnings logged in file make.log
- @${MAKE} mains 2>&1 | tee -a make.log | egrep -i "(.c:|Stop.|---)"
+ ${MAKE} mains
tcl:
- @echo --- errors and warnings logged in file make.log
- @${MAKE} tcllibrary 2>&1 | tee -a make.log | egrep -i "(.c:|Stop.|---)"
+ ${MAKE} tcllibrary
force: clean all
@@ -36,12 +34,12 @@
tcllibrary: database/database.h modules
@echo --- making Tcl shared libraries
for dir in ${PROGRAMS}; do \
- (cd $$dir && ${MAKE} tcl-main); done
+ ${MAKE} -C $$dir tcl-main || exit 1 ; done
mains: database/database.h modules libs
@echo --- making main programs
for dir in ${PROGRAMS}; do \
- (cd $$dir && ${MAKE} main); done
+ ${MAKE} -C $$dir main || exit 1 ; done
database/database.h: database/database.h.in
@echo --- making header file database/database.h
@@ -50,30 +48,30 @@
modules:
@echo --- making modules
for dir in ${MODULES} ${PROGRAMS}; do \
- (cd $$dir && ${MAKE} module); done
+ ${MAKE} -C $$dir module || exit 1 ; done
libs:
@echo --- making libraries
for dir in ${LIBRARIES}; do \
- (cd $$dir && ${MAKE} lib); done
+ ${MAKE} -C $$dir lib || exit 1 ; done
depend: database/database.h
${RM} */Depend
for dir in ${MODULES} ${UNUSED_MODULES} ${PROGRAMS}; do \
- (cd $$dir && ${MAKE} depend); done
+ ${MAKE} -C $$dir depend || exit 1 ; done
install: $(INSTALL_TARGET)
install-magic:
@echo --- installing executable to $(DESTDIR)${BINDIR}
@echo --- installing runtime files to $(DESTDIR)${LIBDIR}
- @${MAKE} install-real 2>&1 >> install.log
+ @${MAKE} install-real 2>&1
install-real: install-dirs
for dir in ${INSTALL_CAD_DIRS}; do \
- (cd $$dir && ${MAKE} install); done
+ ${MAKE} -C $$dir install || exit 1 ; done
for dir in ${PROGRAMS}; do \
- (cd $$dir && ${MAKE} install); done
+ ${MAKE} -C $$dir install || exit 1 ; done
install-tcl-dirs:
${MAGICDIR}/scripts/mkdirs $(DESTDIR)${BINDIR} $(DESTDIR)${MANDIR} \
@@ -86,11 +84,11 @@
install-tcl:
@echo --- installing executable to $(DESTDIR)${BINDIR}
@echo --- installing runtime files to $(DESTDIR)${LIBDIR}
- @${MAKE} install-tcl-real 2>&1 >> install.log
+ @${MAKE} install-tcl-real
install-tcl-real: install-tcl-dirs
for dir in ${INSTALL_CAD_DIRS} ${PROGRAMS}; do \
- (cd $$dir && ${MAKE} install-tcl); done
+ ${MAKE} -C $$dir install-tcl || exit 1 ; done
clean:
for dir in ${MODULES} ${PROGRAMS} ${TECH} ${UNUSED_MODULES}; do \