diff options
| author | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2021-01-09 23:36:58 +0000 |
|---|---|---|
| committer | Mohammad Akhlaghi <mohammad@akhlaghi.org> | 2021-01-09 23:44:32 +0000 |
| commit | 55d6570aecc5f442399262b7faa441d16ccd4556 (patch) | |
| tree | 0e23073eadd7f5169b3ce38e829763a65e71b5cb /reproduce/software/make | |
| parent | e3f4be66020538e3ab641f91405b8c07582e5862 (diff) | |
| parent | d9a6855948fad17fa0fbc2017ab2be0238ca8b72 (diff) | |
Imported recent changes in Maneage, minor single conflict fixed
There was a single conflict in the comments of one part of 'configure.sh'
that has been fixed.
There was also a single place that needed to convert 'BDIR' to 'badir' in
this project (so after the merge, it also built easily).
Diffstat (limited to 'reproduce/software/make')
| -rw-r--r-- | reproduce/software/make/basic.mk | 4 | ||||
| -rw-r--r-- | reproduce/software/make/high-level.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/reproduce/software/make/basic.mk b/reproduce/software/make/basic.mk index 2a28e76..9217ee9 100644 --- a/reproduce/software/make/basic.mk +++ b/reproduce/software/make/basic.mk @@ -48,7 +48,7 @@ include reproduce/software/config/checksums.conf include reproduce/software/config/urls.conf # Basic directories -lockdir = $(BDIR)/locks +lockdir = $(BDIR)/software/locks tdir = $(BDIR)/software/tarballs ddir = $(BDIR)/software/build-tmp idir = $(BDIR)/software/installed @@ -1274,7 +1274,7 @@ $(ibidir)/binutils-$(binutils-version): \ if ! [ x"$(sys_library_path)" = x ]; then for f in $(sys_library_path)/*crt*.o; do b=$$($(ibdir)/basename $$f) - ln -s $$f $(ildir)/$$b + ln -sf $$f $(ildir)/$$b done fi diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk index 948b23a..d69722e 100644 --- a/reproduce/software/make/high-level.mk +++ b/reproduce/software/make/high-level.mk @@ -43,7 +43,7 @@ include reproduce/software/config/TARGETS.conf include reproduce/software/config/texlive-packages.conf # Basic directories (similar to 'basic.mk'). -lockdir = $(BDIR)/locks +lockdir = $(BDIR)/software/locks tdir = $(BDIR)/software/tarballs ddir = $(BDIR)/software/build-tmp idir = $(BDIR)/software/installed |