dany/antos
1
0
Fork 0
mirror of https://github.com/antos-rde/antos.git synced 2025-04-30 04:36:47 +02:00
Code Issues 6 Actions Packages Projects Releases Wiki Activity

fix(make): correct DESTDIR and prefix in Makefile
Some checks failed
gitea-sync/antos/pipeline/head There was a failure building this commit
Details

Browse Source
This commit is contained in:
DanyLE 2024-03-10 01:21:28 +01:00
parent 4e583d9795
commit df40400af6
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile
View File

@ -8,7 +8,8 @@ CARGO_HOME?=/opt/rust/cargo
RUST_TARGET?=x86_64-unknown-linux-gnu RUST_TARGET?=x86_64-unknown-linux-gnu
DESTDIR?=$(ROOT_DIR)/build/ DESTDIR?=$(ROOT_DIR)/build/
BUILD_PREFIX:=$(DESTDIR)/opt/www BUILD_PREFIX:=/opt/www
INSTALL_DIR:=$(DESTDIR)/$(BUILD_PREFIX)
VERSION?=2.0.0 VERSION?=2.0.0
BRANCH?=b BRANCH?=b
@ -22,8 +23,8 @@ all: antos tar.gz
antos: antd backend frontend antos: antd backend frontend
antd: httpd plugins luasec luasocket silk luafcgi antd: httpd plugins luasec luasocket silk luafcgi
rm $(BUILD_PREFIX)/runner.ini rm $(INSTALL_DIR)/runner.ini
cp $(ROOT_DIR)/config/*.ini $(BUILD_PREFIX)/etc cp $(ROOT_DIR)/config/*.ini $(INSTALL_DIR)/etc
@echo "Finish building Antd server" @echo "Finish building Antd server"
httpd: httpd:
@ -67,20 +68,20 @@ luasocket:
antd-% sil%: httpd antd-% sil%: httpd
@echo "Building $@" @echo "Building $@"
cd $(ROOT_DIR)/antd/$@ && libtoolize && aclocal && autoconf && automake --add-missing cd $(ROOT_DIR)/antd/$@ && libtoolize && aclocal && autoconf && automake --add-missing
cd $(ROOT_DIR)/antd/$@ && CFLAGS="-I$(BUILD_PREFIX)/include" LDFLAGS="-L$(BUILD_PREFIX)/lib" ./configure --prefix=$(BUILD_PREFIX) cd $(ROOT_DIR)/antd/$@ && CFLAGS="-I$(INSTALL_DIR)/include" LDFLAGS="-L$(INSTALL_DIR)/lib" ./configure --prefix=$(BUILD_PREFIX)
make -C $(ROOT_DIR)/antd/$@ install make -C $(ROOT_DIR)/antd/$@ install
luafcgi: luafcgi:
ifeq ($(LUAFCGI_IGNORE),) ifeq ($(LUAFCGI_IGNORE),)
@echo "Building $@" @echo "Building $@"
mkdir -p $(BUILD_PREFIX)/bin mkdir -p $(INSTALL_DIR)/bin
RUSTUP_HOME=$(RUSTUP_HOME) CARGO_HOME=$(CARGO_HOME) \ RUSTUP_HOME=$(RUSTUP_HOME) CARGO_HOME=$(CARGO_HOME) \
. $(CARGO_HOME)/env && \ . $(CARGO_HOME)/env && \
rustup target add $(RUST_TARGET) && \ rustup target add $(RUST_TARGET) && \
cargo build --target=$(RUST_TARGET) --release \ cargo build --target=$(RUST_TARGET) --release \
--manifest-path=$(ROOT_DIR)/antd/luafcgi/Cargo.toml \ --manifest-path=$(ROOT_DIR)/antd/luafcgi/Cargo.toml \
--config=$(ROOT_DIR)/antd/luafcgi/.cargo/config.toml --config=$(ROOT_DIR)/antd/luafcgi/.cargo/config.toml
install -m 0755 $(ROOT_DIR)/antd/luafcgi/target/$(RUST_TARGET)/release/luad $(BUILD_PREFIX)/bin install -m 0755 $(ROOT_DIR)/antd/luafcgi/target/$(RUST_TARGET)/release/luad $(INSTALL_DIR)/bin
else else
@echo "Ignore building $@" @echo "Ignore building $@"
endif endif
@ -101,14 +102,14 @@ clean:
backend: backend:
@echo "Building $@" @echo "Building $@"
mkdir -p $(BUILD_PREFIX)/htdocs/os mkdir -p $(INSTALL_DIR)/htdocs/os
DESTDIR=$(BUILD_PREFIX)/htdocs/os make -C antos-backend DESTDIR=$(INSTALL_DIR)/htdocs/os make -C antos-backend
frontend: frontend:
ifeq ($(FRONTEND_IGNORE),) ifeq ($(FRONTEND_IGNORE),)
@echo "Building $@" @echo "Building $@"
mkdir -p $(BUILD_PREFIX)/htdocs/os mkdir -p $(INSTALL_DIR)/htdocs/os
BUILDDIR=$(BUILD_PREFIX)/htdocs/os make -C antos-frontend install_dev release BUILDDIR=$(INSTALL_DIR)/htdocs/os make -C antos-frontend install_dev release
else else
@echo "Ignore building $@" @echo "Ignore building $@"
endif endif