5fe4d9edf9
- bring in latest patches - added subpackages for demos and debuglibs - only install Motif.rules and Motif.tmpl in config - don't build config tools that OpenBSD already has
35 lines
1.2 KiB
Plaintext
35 lines
1.2 KiB
Plaintext
--- Makefile.orig Wed May 3 02:12:34 2000
|
|
+++ Makefile Mon Nov 20 19:36:43 2000
|
|
@@ -59,7 +59,7 @@
|
|
DEPENDTOP = ../..
|
|
IMAKETOP = ../..
|
|
IRULESRC = $(CONFIGSRC)/cf
|
|
- IMAKE = $(IMAKESRC)/imake
|
|
+ IMAKE = /usr/X11R6/bin/imake
|
|
IMAKE_CMD = $(IMAKE) -I$(IRULESRC) $(IMAKE_DEFINES)
|
|
MAKE_OPTS = -f xmakefile
|
|
MAKE_CMD = $(MAKE) $(MAKE_OPTS)
|
|
@@ -95,7 +95,7 @@
|
|
;; esac;
|
|
@date
|
|
@echo ""
|
|
- cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean
|
|
+# cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean
|
|
$(MAKE) $(MFLAGS) Makefile.boot
|
|
$(MAKE_CMD) $(MFLAGS) VerifyOS
|
|
$(MAKE_CMD) $(MFLAGS) Makefiles
|
|
@@ -115,7 +115,12 @@
|
|
# This is just a sequence of bootstrapping steps we have to do.
|
|
# The steps are listed as separate targets so clearmake can wink in
|
|
# the Makefile.proto files.
|
|
-Makefile.boot: imake.proto $(DEPENDSRC)/Makefile.proto depend.bootstrap $(IMAKESRC)/Makefile.proto imake.bootstrap
|
|
+#Makefile.boot: imake.proto $(DEPENDSRC)/Makefile.proto depend.bootstrap $(IMAKESRC)/Makefile.proto imake.bootstrap
|
|
+Makefile.boot:
|
|
+ -@if [ -f xmakefile ]; then set -x; \
|
|
+ $(RM) xmakefile.bak; $(MV) xmakefile xmakefile.bak; \
|
|
+ else exit 0; fi
|
|
+ $(MAKE) $(MFLAGS) xmakefile
|
|
|
|
imake.proto:
|
|
cd $(IMAKESRC) && $(MAKE) $(FLAGS)
|