From c0ea703079ea9e209c07b0c67d4f2818cd6d94fd Mon Sep 17 00:00:00 2001 From: Z572 <873216071@qq.com> Date: Mon, 6 Sep 2021 18:44:38 +0800 Subject: [PATCH 2/3] gnu: emacs-telega-server: use make-flags instead of modify makefile. * gnu/packages/emacs-xyz.scm (emacs-telega-server)[arguments]: Add the #:make-flags argument. and remove substitute* makefile. --- gnu/packages/emacs-xyz.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index e682d9cdd2..081e8cceab 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -26614,18 +26614,17 @@ other @code{helm-type-file} sources such as @code{helm-locate}.") "emacs-telega-test-env.patch")))) (build-system gnu-build-system) (arguments - `(#:phases + `(#:make-flags + (list (string-append "CC=" ,(cc-for-target)) + (string-append "INSTALL_PREFIX=" + (assoc-ref %outputs "out") "/bin")) + #:phases (modify-phases %standard-phases (add-before 'configure 'enter-subdirectory (lambda _ (chdir "server") #t)) (replace 'configure (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (substitute* "Makefile" - (("CC=cc") ,(string-append "CC=" (cc-for-target))) - (("^(INSTALL_PREFIX=).*$" _all prefix) - (string-append prefix out "/bin\n"))) - (substitute* "run_tests.py" (("^(TELEGA_SERVER = ).*$" _all prefix) (string-append prefix -- 2.33.0