Skip to content

Commit 951b2fe

Browse files
committed
bindist: Be more explicit about which binaries to package
1 parent e7e4991 commit 951b2fe

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -744,14 +744,19 @@ endif
744744
bindist:
745745
# Extra directory in which we'll put together the binary release package
746746
# (needed anyways to avoid tarbombs)
747-
mkdir $(FBPACKAGE)
747+
mkdir -p $(FBPACKAGE)/bin $(FBPACKAGE)/lib
748748

749749
# Binaries from the build dir: fbc[.exe] or bin/fbc[.exe], bin/ and lib/
750750
# (we're expecting bin/ and lib/ to be filled with the proper external
751751
# binaries already in case of standalone setups)
752-
cp -R bin lib $(FBPACKAGE)
753752
ifdef ENABLE_STANDALONE
753+
cp -R bin/$(FBTARGET) $(FBPACKAGE)/bin
754+
cp -R lib/$(FBTARGET) $(FBPACKAGE)/lib
754755
cp $(FBC_EXE) $(FBPACKAGE)
756+
else
757+
mkdir -p $(FBPACKAGE)/lib/freebasic
758+
cp $(FBC_EXE) $(FBPACKAGE)/bin
759+
cp -R lib/freebasic/$(FBTARGET) $(FBPACKAGE)/lib/freebasic
755760
endif
756761

757762
# Remove lib/win32/*.def stuff. We have it in the source tree (not in

0 commit comments

Comments
 (0)