Skip to content

Commit 96f5d91

Browse files
committed
make install: Always create dirs
This should be a bit simpler and matches how "make install" really is more like a script than a dependency-based build.
1 parent d03a7d1 commit 96f5d91

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

makefile

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,7 @@ ifdef ENABLE_STANDALONE
338338
FBCNEW_EXE := fbc-new$(EXEEXT)
339339
libdir := lib/$(libsubdir)
340340
PREFIX_FBC_EXE := $(prefix)/fbc$(EXEEXT)
341+
prefixbindir := $(prefix)
341342
prefixincdir := $(prefix)/inc
342343
prefixlibdir := $(prefix)/lib/$(libsubdir)
343344
else
@@ -512,7 +513,7 @@ $(libfbgfxpicobjdir) \
512513
$(libfbgfxmtobjdir) \
513514
$(libfbgfxmtpicobjdir) \
514515
$(djgpplibcobjdir) \
515-
bin $(libdir) $(prefixbindir) $(prefixincdir) $(prefixlibdir):
516+
bin $(libdir):
516517
mkdir -p $@
517518

518519
################################################################################
@@ -618,17 +619,21 @@ $(LIBFBGFXMTPIC_C): $(libfbgfxmtpicobjdir)/%.o: %.c $(LIBFBGFX_H)
618619
.PHONY: install install-compiler install-includes install-rtlib install-gfxlib2
619620
install: install-compiler install-includes install-rtlib install-gfxlib2
620621

621-
install-compiler: $(prefixbindir)
622+
install-compiler:
623+
mkdir -p $(prefixbindir)
622624
$(INSTALL_PROGRAM) $(FBC_EXE) $(PREFIX_FBC_EXE)
623625

624-
install-includes: $(prefixincdir)
626+
install-includes:
627+
mkdir -p $(prefixincdir)
625628
cp -r $(rootdir)inc/* $(prefixincdir)
626629

627-
install-rtlib: $(prefixlibdir)
628-
$(INSTALL_FILE) $(RTL_LIBS) $(prefixlibdir)/
630+
install-rtlib:
631+
mkdir -p $(prefixlibdir)
632+
$(INSTALL_FILE) $(RTL_LIBS) $(prefixlibdir)
629633

630-
install-gfxlib2: $(prefix)/lib $(prefixlibdir)
631-
$(INSTALL_FILE) $(GFX_LIBS) $(prefixlibdir)/
634+
install-gfxlib2:
635+
mkdir -p $(prefixlibdir)
636+
$(INSTALL_FILE) $(GFX_LIBS) $(prefixlibdir)
632637

633638
################################################################################
634639

0 commit comments

Comments
 (0)