mirror of
https://github.com/antos-rde/antos.git
synced 2025-04-29 20:26:45 +02:00
fix(make): correct DESTDIR and prefix in Makefile
Some checks failed
gitea-sync/antos/pipeline/head There was a failure building this commit
Some checks failed
gitea-sync/antos/pipeline/head There was a failure building this commit
This commit is contained in:
parent
4e583d9795
commit
df40400af6
21
Makefile
21
Makefile
@ -8,7 +8,8 @@ CARGO_HOME?=/opt/rust/cargo
|
||||
RUST_TARGET?=x86_64-unknown-linux-gnu
|
||||
|
||||
DESTDIR?=$(ROOT_DIR)/build/
|
||||
BUILD_PREFIX:=$(DESTDIR)/opt/www
|
||||
BUILD_PREFIX:=/opt/www
|
||||
INSTALL_DIR:=$(DESTDIR)/$(BUILD_PREFIX)
|
||||
|
||||
VERSION?=2.0.0
|
||||
BRANCH?=b
|
||||
@ -22,8 +23,8 @@ all: antos tar.gz
|
||||
antos: antd backend frontend
|
||||
|
||||
antd: httpd plugins luasec luasocket silk luafcgi
|
||||
rm $(BUILD_PREFIX)/runner.ini
|
||||
cp $(ROOT_DIR)/config/*.ini $(BUILD_PREFIX)/etc
|
||||
rm $(INSTALL_DIR)/runner.ini
|
||||
cp $(ROOT_DIR)/config/*.ini $(INSTALL_DIR)/etc
|
||||
@echo "Finish building Antd server"
|
||||
|
||||
httpd:
|
||||
@ -67,20 +68,20 @@ luasocket:
|
||||
antd-% sil%: httpd
|
||||
@echo "Building $@"
|
||||
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
|
||||
|
||||
luafcgi:
|
||||
ifeq ($(LUAFCGI_IGNORE),)
|
||||
@echo "Building $@"
|
||||
mkdir -p $(BUILD_PREFIX)/bin
|
||||
mkdir -p $(INSTALL_DIR)/bin
|
||||
RUSTUP_HOME=$(RUSTUP_HOME) CARGO_HOME=$(CARGO_HOME) \
|
||||
. $(CARGO_HOME)/env && \
|
||||
rustup target add $(RUST_TARGET) && \
|
||||
cargo build --target=$(RUST_TARGET) --release \
|
||||
--manifest-path=$(ROOT_DIR)/antd/luafcgi/Cargo.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
|
||||
@echo "Ignore building $@"
|
||||
endif
|
||||
@ -101,14 +102,14 @@ clean:
|
||||
|
||||
backend:
|
||||
@echo "Building $@"
|
||||
mkdir -p $(BUILD_PREFIX)/htdocs/os
|
||||
DESTDIR=$(BUILD_PREFIX)/htdocs/os make -C antos-backend
|
||||
mkdir -p $(INSTALL_DIR)/htdocs/os
|
||||
DESTDIR=$(INSTALL_DIR)/htdocs/os make -C antos-backend
|
||||
|
||||
frontend:
|
||||
ifeq ($(FRONTEND_IGNORE),)
|
||||
@echo "Building $@"
|
||||
mkdir -p $(BUILD_PREFIX)/htdocs/os
|
||||
BUILDDIR=$(BUILD_PREFIX)/htdocs/os make -C antos-frontend install_dev release
|
||||
mkdir -p $(INSTALL_DIR)/htdocs/os
|
||||
BUILDDIR=$(INSTALL_DIR)/htdocs/os make -C antos-frontend install_dev release
|
||||
else
|
||||
@echo "Ignore building $@"
|
||||
endif
|
||||
|
Loading…
x
Reference in New Issue
Block a user