diff --git a/app-editors/emacs/emacs-29.1-r5.ebuild b/app-editors/emacs/emacs-29.1-r5.ebuild index 12d36dabf21a0..4b7c9693bece7 100644 --- a/app-editors/emacs/emacs-29.1-r5.ebuild +++ b/app-editors/emacs/emacs-29.1-r5.ebuild @@ -390,10 +390,12 @@ src_compile() { # Save native build tools in the cross-directory cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die # Specify the native Emacs to compile lisp - emake -C lisp all EMACS="${S}-build/src/emacs" + EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" ) + emake "${EMACS_EMAKE_ARGS[@]}" actual-all + else + unset EMACS_EMAKE_ARGS + emake fi - - emake } src_test() { @@ -441,7 +443,7 @@ src_test() { } src_install() { - emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install + emake "${EMACS_EMAKE_ARGS[@]}" DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die diff --git a/app-editors/emacs/emacs-29.1.90.ebuild b/app-editors/emacs/emacs-29.1.90.ebuild index ac342a06b3fd3..14dd93aefa009 100644 --- a/app-editors/emacs/emacs-29.1.90.ebuild +++ b/app-editors/emacs/emacs-29.1.90.ebuild @@ -387,10 +387,12 @@ src_compile() { # Save native build tools in the cross-directory cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die # Specify the native Emacs to compile lisp - emake -C lisp all EMACS="${S}-build/src/emacs" + EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" ) + emake "${EMACS_EMAKE_ARGS[@]}" actual-all + else + unset EMACS_EMAKE_ARGS + emake fi - - emake } src_test() { @@ -438,7 +440,7 @@ src_test() { } src_install() { - emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install + emake "${EMACS_EMAKE_ARGS[@]}" DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die diff --git a/app-editors/emacs/emacs-29.1.9999.ebuild b/app-editors/emacs/emacs-29.1.9999.ebuild index ac342a06b3fd3..14dd93aefa009 100644 --- a/app-editors/emacs/emacs-29.1.9999.ebuild +++ b/app-editors/emacs/emacs-29.1.9999.ebuild @@ -387,10 +387,12 @@ src_compile() { # Save native build tools in the cross-directory cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die # Specify the native Emacs to compile lisp - emake -C lisp all EMACS="${S}-build/src/emacs" + EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" ) + emake "${EMACS_EMAKE_ARGS[@]}" actual-all + else + unset EMACS_EMAKE_ARGS + emake fi - - emake } src_test() { @@ -438,7 +440,7 @@ src_test() { } src_install() { - emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install + emake "${EMACS_EMAKE_ARGS[@]}" DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild b/app-editors/emacs/emacs-30.0.9999.ebuild index 5f9be5cc49914..ab14d02c094b1 100644 --- a/app-editors/emacs/emacs-30.0.9999.ebuild +++ b/app-editors/emacs/emacs-30.0.9999.ebuild @@ -389,10 +389,12 @@ src_compile() { # Save native build tools in the cross-directory cp "${S}-build"/lib-src/make-{docfile,fingerprint} lib-src || die # Specify the native Emacs to compile lisp - emake -C lisp all EMACS="${S}-build/src/emacs" + EMACS_EMAKE_ARGS=( EMACS="${S}-build/src/emacs" ) + emake "${EMACS_EMAKE_ARGS[@]}" actual-all + else + unset EMACS_EMAKE_ARGS + emake fi - - emake } src_test() { @@ -440,7 +442,7 @@ src_test() { } src_install() { - emake DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install + emake "${EMACS_EMAKE_ARGS[@]}" DESTDIR="${D}" NO_BIN_LINK=t BLESSMAIL_TARGET= install mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} || die mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 || die