Skip to content

Commit 876a849

Browse files
committed
Merge branch 'simpler-make' into develop
2 parents 4818681 + a78db43 commit 876a849

File tree

196 files changed

+408
-1904
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+408
-1904
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
temp*
1+
bin
2+
obj
23
docs/build
34
docs/source/_build
45
.idea

Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@ COPY --chown=docker:docker . .
4343

4444
# Build, install, check FORCE
4545
RUN echo "building FORCE" && \
46-
./splits.sh enable && \
4746
./debug.sh $debug && \
48-
sed -i "/^BINDIR=/cBINDIR=$INSTALL_DIR/" Makefile && \
47+
sed -i "/^INSTALLDIR=/cINSTALLDIR=$INSTALL_DIR/" Makefile && \
4948
make -j && \
5049
make install && \
5150
make clean && \

0 commit comments

Comments
 (0)