diff --git a/sysa/perl-5.003/files/config.h b/sysa/perl-5.003/files/config.h index 7656fc2..5d4b31d 100644 --- a/sysa/perl-5.003/files/config.h +++ b/sysa/perl-5.003/files/config.h @@ -85,6 +85,4 @@ #define OSNAME "linux" -#define PRIVLIB_EXP "/after/lib/perl5/5.003" - #undef __DATE__ /* want reproducible build */ diff --git a/sysa/perl-5.003/mk/main.mk b/sysa/perl-5.003/mk/main.mk index 0588931..25dd191 100644 --- a/sysa/perl-5.003/mk/main.mk +++ b/sysa/perl-5.003/mk/main.mk @@ -2,7 +2,11 @@ # SPDX-License-Identifier: GPL-3.0-or-later +VERSION=5.003 +PRIVLIB_EXP=$(PREFIX)/lib/perl5/$(VERSION) + CC = tcc +CFLAGS = -DPRIVLIB_EXP=\"$(PRIVLIB_EXP)\" .PHONY: all @@ -16,5 +20,5 @@ miniperl: $(MINIPERL_OBJ) install: all install miniperl $(PREFIX)/bin/perl - mkdir -p $(PREFIX)/lib/perl5/5.003 - cp -r lib/* $(PREFIX)/lib/perl5/5.003/ + mkdir -p "$(PRIVLIB_EXP)" + cp -r lib/* "$(PRIVLIB_EXP)" diff --git a/sysa/perl5.004_05/files/config.h b/sysa/perl5.004_05/files/config.h index 9b1206b..7fe2e8b 100644 --- a/sysa/perl5.004_05/files/config.h +++ b/sysa/perl5.004_05/files/config.h @@ -85,8 +85,6 @@ #define OSNAME "linux" -#define PRIVLIB_EXP "/after/lib/perl5/5.004_05" - #undef __DATE__ /* want reproducible build */ #define Malloc_t void * diff --git a/sysa/perl5.004_05/mk/main.mk b/sysa/perl5.004_05/mk/main.mk index 6825b19..a975888 100644 --- a/sysa/perl5.004_05/mk/main.mk +++ b/sysa/perl5.004_05/mk/main.mk @@ -2,7 +2,11 @@ # SPDX-License-Identifier: GPL-3.0-or-later +VERSION=5.004_05 +PRIVLIB_EXP=$(PREFIX)/lib/perl5/$(VERSION) + CC = tcc +CFLAGS = -DPRIVLIB_EXP=\"$(PRIVLIB_EXP)\" .PHONY: all @@ -16,5 +20,5 @@ miniperl: $(MINIPERL_OBJ) install: all install miniperl $(PREFIX)/bin/perl - mkdir -p $(PREFIX)/lib/perl5/5.004_05 - cp -R lib/* $(PREFIX)/lib/perl5/5.004_05/ + mkdir -p "$(PRIVLIB_EXP)" + cp -r lib/* "$(PRIVLIB_EXP)" diff --git a/sysa/perl5.004_05/perl5.004_05.sh b/sysa/perl5.004_05/perl5.004_05.sh index 1ffc7e8..12e5206 100755 --- a/sysa/perl5.004_05/perl5.004_05.sh +++ b/sysa/perl5.004_05/perl5.004_05.sh @@ -19,8 +19,8 @@ src_prepare() { } src_install() { - default_src_install - # Remove old perl - rm -rf "${PREFIX}"/lib/perl5/5.003 + rm -rf "${PREFIX}"/lib/perl5/ + + default_src_install } diff --git a/sysa/perl5.005_03/checksums b/sysa/perl5.005_03/checksums index 093832d..8e0e86b 100644 --- a/sysa/perl5.005_03/checksums +++ b/sysa/perl5.005_03/checksums @@ -1 +1 @@ -b00ec19d8e9ce7930630bb47387d7f408f72fe00b056d6aea953a8bfb50d82ff /after/bin/perl +9d0a972fbcd54033f425b00d8941bb620c3358b40a4b49c175e5ca5c45dba3b2 /after/bin/perl diff --git a/sysa/perl5.005_03/files/config.h b/sysa/perl5.005_03/files/config.h index 1ae2006..7fe2e8b 100644 --- a/sysa/perl5.005_03/files/config.h +++ b/sysa/perl5.005_03/files/config.h @@ -85,8 +85,6 @@ #define OSNAME "linux" -#define PRIVLIB_EXP "/after/lib/perl5/5.005_03" - #undef __DATE__ /* want reproducible build */ #define Malloc_t void * diff --git a/sysa/perl5.005_03/mk/main.mk b/sysa/perl5.005_03/mk/main.mk index 3356c59..87f8999 100644 --- a/sysa/perl5.005_03/mk/main.mk +++ b/sysa/perl5.005_03/mk/main.mk @@ -2,7 +2,11 @@ # SPDX-License-Identifier: GPL-3.0-or-later +VERSION=5.005_03 +PRIVLIB_EXP=$(PREFIX)/lib/perl5/$(VERSION) + CC = tcc +CFLAGS = -DPRIVLIB_EXP=\"$(PRIVLIB_EXP)\" .PHONY: all @@ -16,5 +20,5 @@ miniperl: $(MINIPERL_OBJ) install: all install miniperl $(PREFIX)/bin/perl - mkdir -p $(PREFIX)/lib/perl5/5.005_03 - cp -R lib/* $(PREFIX)/lib/perl5/5.005_03/ + mkdir -p "$(PRIVLIB_EXP)" + cp -r lib/* "$(PRIVLIB_EXP)" diff --git a/sysa/perl5.005_03/perl5.005_03.sh b/sysa/perl5.005_03/perl5.005_03.sh index ce06873..ed92561 100755 --- a/sysa/perl5.005_03/perl5.005_03.sh +++ b/sysa/perl5.005_03/perl5.005_03.sh @@ -23,8 +23,8 @@ src_prepare() { } src_install() { - default_src_install - # Remove old perl - rm -rf "${PREFIX}"/lib/perl5/5.004_05 + rm -rf "${PREFIX}"/lib/perl5/ + + default_src_install }