Skip to content

Commit bb98b88

Browse files
dkldkl
committed
bindist: Rely on "make install" instead of copying manually
1 parent 951b2fe commit bb98b88

File tree

1 file changed

+145
-166
lines changed

1 file changed

+145
-166
lines changed

‎makefile‎

Lines changed: 145 additions & 166 deletions
Original file line numberDiff line numberDiff line change
@@ -740,182 +740,161 @@ ifndef FBMANIFEST
740740
FBMANIFEST := $(subst -$(FBVERSION),,$(FBPACKAGE))
741741
endif
742742

743+
ifdef ENABLE_STANDALONE
744+
packinc := $(FBPACKAGE)/inc/
745+
else
746+
packinc := $(FBPACKAGE)/include/$(FBNAME)/
747+
endif
748+
743749
.PHONY: bindist
744750
bindist:
745751
# Extra directory in which we'll put together the binary release package
746752
# (needed anyways to avoid tarbombs)
747-
mkdir -p $(FBPACKAGE)/bin $(FBPACKAGE)/lib
748-
749-
# Binaries from the build dir: fbc[.exe] or bin/fbc[.exe], bin/ and lib/
750-
# (we're expecting bin/ and lib/ to be filled with the proper external
751-
# binaries already in case of standalone setups)
752-
ifdef ENABLE_STANDALONE
753-
cp -R bin/$(FBTARGET) $(FBPACKAGE)/bin
754-
cp -R lib/$(FBTARGET) $(FBPACKAGE)/lib
755-
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
760-
endif
761753

762-
# Remove lib/win32/*.def stuff. We have it in the source tree (not in
763-
# build dir if separate though) but don't want to include it into the
764-
# binary release packages.
765-
cd $(FBPACKAGE) && rm -rf lib/win32/*.def lib/win32/makefile lib/fbextra.x
766-
rmdir $(FBPACKAGE)/lib/win32 || true
754+
make install prefix=$(FBPACKAGE)
767755

768-
# Includes: inc/, include/freebasic/ or include/freebas/
769-
cp -R $(rootdir)inc $(FBPACKAGE)
770756
ifeq ($(TARGET_OS),dos)
771-
rm -r $(FBPACKAGE)/inc/AL
772-
rm -r $(FBPACKAGE)/inc/allegro5
773-
rm -r $(FBPACKAGE)/inc/atk
774-
rm -r $(FBPACKAGE)/inc/bass.bi
775-
rm -r $(FBPACKAGE)/inc/bassmod.bi
776-
rm -r $(FBPACKAGE)/inc/cairo
777-
rm -r $(FBPACKAGE)/inc/cd
778-
rm -r $(FBPACKAGE)/inc/chipmunk
779-
rm -r $(FBPACKAGE)/inc/crt/arpa
780-
rm -r $(FBPACKAGE)/inc/crt/bits
781-
rm -r $(FBPACKAGE)/inc/crt/linux
782-
rm -r $(FBPACKAGE)/inc/crt/netdb.bi
783-
rm -r $(FBPACKAGE)/inc/crt/netinet/in.bi
784-
rm -r $(FBPACKAGE)/inc/crt/netinet/linux/in.bi
785-
rm -r $(FBPACKAGE)/inc/crt/sys/linux
786-
rm -r $(FBPACKAGE)/inc/crt/sys/socket.bi
787-
rm -r $(FBPACKAGE)/inc/crt/sys/win32
788-
rm -r $(FBPACKAGE)/inc/crt/win32
789-
rm -r $(FBPACKAGE)/inc/curses/ncurses.bi
790-
rm -r $(FBPACKAGE)/inc/disphelper
791-
rm -r $(FBPACKAGE)/inc/fastcgi
792-
rm -r $(FBPACKAGE)/inc/ffi.bi
793-
rm -r $(FBPACKAGE)/inc/flite
794-
rm -r $(FBPACKAGE)/inc/fmod.bi
795-
rm -r $(FBPACKAGE)/inc/fontconfig
796-
rm -r $(FBPACKAGE)/inc/FreeImage.bi
797-
rm -r $(FBPACKAGE)/inc/freetype2
798-
rm -r $(FBPACKAGE)/inc/gdk*
799-
rm -r $(FBPACKAGE)/inc/gio
800-
rm -r $(FBPACKAGE)/inc/GL
801-
rm -r $(FBPACKAGE)/inc/glade
802-
rm -r $(FBPACKAGE)/inc/glib*
803-
rm -r $(FBPACKAGE)/inc/gmodule.bi
804-
rm -r $(FBPACKAGE)/inc/goocanvas.bi
805-
rm -r $(FBPACKAGE)/inc/gtk*
806-
rm -r $(FBPACKAGE)/inc/im
807-
rm -r $(FBPACKAGE)/inc/IUP*
808-
rm -r $(FBPACKAGE)/inc/japi*
809-
rm -r $(FBPACKAGE)/inc/jni.bi
810-
rm -r $(FBPACKAGE)/inc/json*
811-
rm -r $(FBPACKAGE)/inc/libart_lgpl
812-
rm -r $(FBPACKAGE)/inc/MediaInfo*
813-
rm -r $(FBPACKAGE)/inc/modplug.bi
814-
rm -r $(FBPACKAGE)/inc/mpg123.bi
815-
rm -r $(FBPACKAGE)/inc/mysql
816-
rm -r $(FBPACKAGE)/inc/Newton.bi
817-
rm -r $(FBPACKAGE)/inc/ode
818-
rm -r $(FBPACKAGE)/inc/ogg
819-
rm -r $(FBPACKAGE)/inc/pango
820-
rm -r $(FBPACKAGE)/inc/pdflib.bi
821-
rm -r $(FBPACKAGE)/inc/portaudio.bi
822-
rm -r $(FBPACKAGE)/inc/postgresql
823-
rm -r $(FBPACKAGE)/inc/SDL
824-
rm -r $(FBPACKAGE)/inc/SDL2
825-
rm -r $(FBPACKAGE)/inc/sndfile.bi
826-
rm -r $(FBPACKAGE)/inc/spidermonkey
827-
rm -r $(FBPACKAGE)/inc/uuid.bi
828-
rm -r $(FBPACKAGE)/inc/vlc
829-
rm -r $(FBPACKAGE)/inc/vorbis
830-
rm -r $(FBPACKAGE)/inc/win
831-
rm -r $(FBPACKAGE)/inc/windows.bi
832-
rm -r $(FBPACKAGE)/inc/wx-c
833-
rm -r $(FBPACKAGE)/inc/X11
834-
rm -r $(FBPACKAGE)/inc/xmp.bi
835-
rm -r $(FBPACKAGE)/inc/zmq
757+
rm -r $(packinc)AL
758+
rm -r $(packinc)allegro5
759+
rm -r $(packinc)atk
760+
rm -r $(packinc)bass.bi
761+
rm -r $(packinc)bassmod.bi
762+
rm -r $(packinc)cairo
763+
rm -r $(packinc)cd
764+
rm -r $(packinc)chipmunk
765+
rm -r $(packinc)crt/arpa
766+
rm -r $(packinc)crt/bits
767+
rm -r $(packinc)crt/linux
768+
rm -r $(packinc)crt/netdb.bi
769+
rm -r $(packinc)crt/netinet/in.bi
770+
rm -r $(packinc)crt/netinet/linux/in.bi
771+
rm -r $(packinc)crt/sys/linux
772+
rm -r $(packinc)crt/sys/socket.bi
773+
rm -r $(packinc)crt/sys/win32
774+
rm -r $(packinc)crt/win32
775+
rm -r $(packinc)curses/ncurses.bi
776+
rm -r $(packinc)disphelper
777+
rm -r $(packinc)fastcgi
778+
rm -r $(packinc)ffi.bi
779+
rm -r $(packinc)flite
780+
rm -r $(packinc)fmod.bi
781+
rm -r $(packinc)fontconfig
782+
rm -r $(packinc)FreeImage.bi
783+
rm -r $(packinc)freetype2
784+
rm -r $(packinc)gdk*
785+
rm -r $(packinc)gio
786+
rm -r $(packinc)GL
787+
rm -r $(packinc)glade
788+
rm -r $(packinc)glib*
789+
rm -r $(packinc)gmodule.bi
790+
rm -r $(packinc)goocanvas.bi
791+
rm -r $(packinc)gtk*
792+
rm -r $(packinc)im
793+
rm -r $(packinc)IUP*
794+
rm -r $(packinc)japi*
795+
rm -r $(packinc)jni.bi
796+
rm -r $(packinc)json*
797+
rm -r $(packinc)libart_lgpl
798+
rm -r $(packinc)MediaInfo*
799+
rm -r $(packinc)modplug.bi
800+
rm -r $(packinc)mpg123.bi
801+
rm -r $(packinc)mysql
802+
rm -r $(packinc)Newton.bi
803+
rm -r $(packinc)ode
804+
rm -r $(packinc)ogg
805+
rm -r $(packinc)pango
806+
rm -r $(packinc)pdflib.bi
807+
rm -r $(packinc)portaudio.bi
808+
rm -r $(packinc)postgresql
809+
rm -r $(packinc)SDL
810+
rm -r $(packinc)SDL2
811+
rm -r $(packinc)sndfile.bi
812+
rm -r $(packinc)spidermonkey
813+
rm -r $(packinc)uuid.bi
814+
rm -r $(packinc)vlc
815+
rm -r $(packinc)vorbis
816+
rm -r $(packinc)win
817+
rm -r $(packinc)windows.bi
818+
rm -r $(packinc)wx-c
819+
rm -r $(packinc)X11
820+
rm -r $(packinc)xmp.bi
821+
rm -r $(packinc)zmq
836822
endif
823+
837824
ifeq ($(TARGET_ARCH),x86_64)
838825
# Exclude headers which don't support 64bit yet
839-
rm -r $(FBPACKAGE)/inc/AL
840-
rm -r $(FBPACKAGE)/inc/aspell.bi
841-
rm -r $(FBPACKAGE)/inc/bass.bi
842-
rm -r $(FBPACKAGE)/inc/bassmod.bi
843-
rm -r $(FBPACKAGE)/inc/bfd
844-
rm -r $(FBPACKAGE)/inc/bfd.bi
845-
rm -r $(FBPACKAGE)/inc/big_int
846-
rm -r $(FBPACKAGE)/inc/bzlib.bi
847-
rm -r $(FBPACKAGE)/inc/caca0.bi
848-
rm -r $(FBPACKAGE)/inc/caca.bi
849-
rm -r $(FBPACKAGE)/inc/cd
850-
rm -r $(FBPACKAGE)/inc/cgi-util.bi
851-
rm -r $(FBPACKAGE)/inc/chipmunk
852-
rm -r $(FBPACKAGE)/inc/cryptlib.bi
853-
rm -r $(FBPACKAGE)/inc/dislin.bi
854-
rm -r $(FBPACKAGE)/inc/disphelper
855-
rm -r $(FBPACKAGE)/inc/dos
856-
rm -r $(FBPACKAGE)/inc/expat.bi
857-
rm -r $(FBPACKAGE)/inc/flite
858-
rm -r $(FBPACKAGE)/inc/FreeImage.bi
859-
rm -r $(FBPACKAGE)/inc/gd.bi
860-
rm -r $(FBPACKAGE)/inc/gdbm.bi
861-
rm -r $(FBPACKAGE)/inc/gdsl
862-
rm -r $(FBPACKAGE)/inc/gettext-po.bi
863-
rm -r $(FBPACKAGE)/inc/gif_lib.bi
864-
rm -r $(FBPACKAGE)/inc/glade
865-
rm -r $(FBPACKAGE)/inc/gmp.bi
866-
rm -r $(FBPACKAGE)/inc/goocanvas.bi
867-
rm -r $(FBPACKAGE)/inc/grx
868-
rm -r $(FBPACKAGE)/inc/gsl
869-
rm -r $(FBPACKAGE)/inc/IL
870-
rm -r $(FBPACKAGE)/inc/im
871-
rm -r $(FBPACKAGE)/inc/japi.bi
872-
rm -r $(FBPACKAGE)/inc/jni.bi
873-
rm -r $(FBPACKAGE)/inc/jpeglib.bi
874-
rm -r $(FBPACKAGE)/inc/jpgalleg.bi
875-
rm -r $(FBPACKAGE)/inc/json-c
876-
rm -r $(FBPACKAGE)/inc/libart_lgpl
877-
rm -r $(FBPACKAGE)/inc/libintl.bi
878-
rm -r $(FBPACKAGE)/inc/libxml
879-
rm -r $(FBPACKAGE)/inc/libxslt
880-
rm -r $(FBPACKAGE)/inc/lzma.bi
881-
rm -r $(FBPACKAGE)/inc/lzo
882-
rm -r $(FBPACKAGE)/inc/MediaInfo.bi
883-
rm -r $(FBPACKAGE)/inc/modplug.bi
884-
rm -r $(FBPACKAGE)/inc/mpg123.bi
885-
rm -r $(FBPACKAGE)/inc/mxml.bi
886-
rm -r $(FBPACKAGE)/inc/mysql
887-
rm -r $(FBPACKAGE)/inc/Newton.bi
888-
rm -r $(FBPACKAGE)/inc/ode
889-
rm -r $(FBPACKAGE)/inc/ogg
890-
rm -r $(FBPACKAGE)/inc/pcre16.bi
891-
rm -r $(FBPACKAGE)/inc/pcre.bi
892-
rm -r $(FBPACKAGE)/inc/pcreposix.bi
893-
rm -r $(FBPACKAGE)/inc/pdflib.bi
894-
rm -r $(FBPACKAGE)/inc/portaudio.bi
895-
rm -r $(FBPACKAGE)/inc/postgresql
896-
rm -r $(FBPACKAGE)/inc/quicklz.bi
897-
rm -r $(FBPACKAGE)/inc/sndfile.bi
898-
rm -r $(FBPACKAGE)/inc/spidermonkey
899-
rm -r $(FBPACKAGE)/inc/sqlite2.bi
900-
rm -r $(FBPACKAGE)/inc/sqlite3.bi
901-
rm -r $(FBPACKAGE)/inc/sqlite3ext.bi
902-
rm -r $(FBPACKAGE)/inc/tinyptc.bi
903-
rm -r $(FBPACKAGE)/inc/uuid.bi
904-
rm -r $(FBPACKAGE)/inc/vlc
905-
rm -r $(FBPACKAGE)/inc/vorbis
906-
rm -r $(FBPACKAGE)/inc/win/ddk
907-
rm -r $(FBPACKAGE)/inc/win/rc
908-
rm -r $(FBPACKAGE)/inc/wx-c
909-
rm -r $(FBPACKAGE)/inc/xmp.bi
910-
rm -r $(FBPACKAGE)/inc/zmq
911-
endif
912-
ifndef ENABLE_STANDALONE
913-
mkdir -p $(FBPACKAGE)/include
914-
ifeq ($(TARGET_OS),dos)
915-
mv $(FBPACKAGE)/inc $(FBPACKAGE)/include/freebas
916-
else
917-
mv $(FBPACKAGE)/inc $(FBPACKAGE)/include/freebasic
918-
endif
826+
rm -r $(packinc)AL
827+
rm -r $(packinc)aspell.bi
828+
rm -r $(packinc)bass.bi
829+
rm -r $(packinc)bassmod.bi
830+
rm -r $(packinc)bfd
831+
rm -r $(packinc)bfd.bi
832+
rm -r $(packinc)big_int
833+
rm -r $(packinc)bzlib.bi
834+
rm -r $(packinc)caca0.bi
835+
rm -r $(packinc)caca.bi
836+
rm -r $(packinc)cd
837+
rm -r $(packinc)cgi-util.bi
838+
rm -r $(packinc)chipmunk
839+
rm -r $(packinc)cryptlib.bi
840+
rm -r $(packinc)dislin.bi
841+
rm -r $(packinc)disphelper
842+
rm -r $(packinc)dos
843+
rm -r $(packinc)expat.bi
844+
rm -r $(packinc)flite
845+
rm -r $(packinc)FreeImage.bi
846+
rm -r $(packinc)gd.bi
847+
rm -r $(packinc)gdbm.bi
848+
rm -r $(packinc)gdsl
849+
rm -r $(packinc)gettext-po.bi
850+
rm -r $(packinc)gif_lib.bi
851+
rm -r $(packinc)glade
852+
rm -r $(packinc)gmp.bi
853+
rm -r $(packinc)goocanvas.bi
854+
rm -r $(packinc)grx
855+
rm -r $(packinc)gsl
856+
rm -r $(packinc)IL
857+
rm -r $(packinc)im
858+
rm -r $(packinc)japi.bi
859+
rm -r $(packinc)jni.bi
860+
rm -r $(packinc)jpeglib.bi
861+
rm -r $(packinc)jpgalleg.bi
862+
rm -r $(packinc)json-c
863+
rm -r $(packinc)libart_lgpl
864+
rm -r $(packinc)libintl.bi
865+
rm -r $(packinc)libxml
866+
rm -r $(packinc)libxslt
867+
rm -r $(packinc)lzma.bi
868+
rm -r $(packinc)lzo
869+
rm -r $(packinc)MediaInfo.bi
870+
rm -r $(packinc)modplug.bi
871+
rm -r $(packinc)mpg123.bi
872+
rm -r $(packinc)mxml.bi
873+
rm -r $(packinc)mysql
874+
rm -r $(packinc)Newton.bi
875+
rm -r $(packinc)ode
876+
rm -r $(packinc)ogg
877+
rm -r $(packinc)pcre16.bi
878+
rm -r $(packinc)pcre.bi
879+
rm -r $(packinc)pcreposix.bi
880+
rm -r $(packinc)pdflib.bi
881+
rm -r $(packinc)portaudio.bi
882+
rm -r $(packinc)postgresql
883+
rm -r $(packinc)quicklz.bi
884+
rm -r $(packinc)sndfile.bi
885+
rm -r $(packinc)spidermonkey
886+
rm -r $(packinc)sqlite2.bi
887+
rm -r $(packinc)sqlite3.bi
888+
rm -r $(packinc)sqlite3ext.bi
889+
rm -r $(packinc)tinyptc.bi
890+
rm -r $(packinc)uuid.bi
891+
rm -r $(packinc)vlc
892+
rm -r $(packinc)vorbis
893+
rm -r $(packinc)win/ddk
894+
rm -r $(packinc)win/rc
895+
rm -r $(packinc)wx-c
896+
rm -r $(packinc)xmp.bi
897+
rm -r $(packinc)zmq
919898
endif
920899

921900
ifndef DISABLE_DOCS

0 commit comments

Comments
 (0)