aboutsummaryrefslogtreecommitdiff
path: root/cad/magic/files/patch-Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'cad/magic/files/patch-Makefile')
-rw-r--r--cad/magic/files/patch-Makefile84
1 files changed, 0 insertions, 84 deletions
diff --git a/cad/magic/files/patch-Makefile b/cad/magic/files/patch-Makefile
deleted file mode 100644
index 8e8abef319dd..000000000000
--- a/cad/magic/files/patch-Makefile
+++ /dev/null
@@ -1,84 +0,0 @@
---- Makefile.orig 2020-10-16 07:00:06 UTC
-+++ Makefile
-@@ -18,12 +18,10 @@ INSTALL_CAD_DIRS = windows doc ${TECH}
- 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 @@ config:
- 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,31 +48,31 @@ database/database.h: database/database.h.in
- modules: database/database.h depend
- @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
- @echo --- making dependencies
- ${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)${INSTALL_BINDIR}
- @echo --- installing runtime files to $(DESTDIR)${INSTALL_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)${INSTALL_BINDIR} \
-@@ -89,11 +87,11 @@ install-dirs:
- install-tcl:
- @echo --- installing executable to $(DESTDIR)${INSTALL_BINDIR}
- @echo --- installing runtime files to $(DESTDIR)${INSTALL_LIBDIR}
-- @${MAKE} install-tcl-real 2>&1 >> install.log
-+ @${MAKE} install-tcl-real 2>&1
-
- 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 \