# HG changeset patch # User William Astle # Date 1569555469 21600 # Node ID 17fa03d69df36658b537b4a013ca013c5f2e5882 # Parent 14a40f8bb4ebc9a9cdeb69c0e1c99604d613da34 Unbork "make install" The merge of the lwcc stuff borked the Makefile some. This should unbork it. At least it should install the binaries in .../bin again. diff -r 14a40f8bb4eb -r 17fa03d69df3 Makefile --- a/Makefile Wed Sep 25 20:23:49 2019 -0600 +++ b/Makefile Thu Sep 26 21:37:49 2019 -0600 @@ -7,11 +7,6 @@ #PROGSUFFIX := .exe #BUILDTPREFIX=i586-mingw32msvc- -LWTOOLS_VERSION = 4.8 -LWTOOLS_VERSION_SUFFIX = -devcc - -PACKAGE_VERSION = $(LWTOOLS_VERSION)$(LWTOOLS_VERSION_SUFFIX) - ifeq ($(PREFIX),) ifneq ($(DESTDIR),) PREFIX = /usr @@ -181,7 +176,7 @@ %.o: %.c @echo "Building dependencies for $@" - @$(CC) -MM -MG $(CPPFLAGS) -o $*.d $< + @$(CC) -MM $(CPPFLAGS) -o $*.d $< @mv -f $*.d $*.d.tmp @sed -e 's|.*:|$*.o $*.d:|' < $*.d.tmp > $*.d @sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | sed -e 's/^ *//' -e 's/$$/:/' >> $*.d @@ -212,7 +207,8 @@ .PHONY: install install: $(MAIN_TARGETS) install -d $(INSTALLDIR) - install $(MAIN_TARGETS) $(INSTALLDIR) + install -d $(INSTALLBIN) + install $(MAIN_TARGETS) $(INSTALLBIN) install -d $(LWCC_INSTALLLIBDIR) install -d $(LWCC_INSTALLLIBDIR)/bin install -d $(LWCC_INSTALLLIBDIR)/lib