From b12547a1527120e8c06281df476bc9b2d84d0069 Mon Sep 17 00:00:00 2001 From: tejaswidp Date: Fri, 30 Mar 2018 17:43:21 +0530 Subject: [PATCH 1/3] install *.el files irrespective of byte compilation option --- el/CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/el/CMakeLists.txt b/el/CMakeLists.txt index dbc0a5f..7dc8a9e 100644 --- a/el/CMakeLists.txt +++ b/el/CMakeLists.txt @@ -15,6 +15,8 @@ endforeach() set(all_scel_sources ${scel_sources} sclang-vars.el) +install (FILES ${scel_sources} ${CMAKE_CURRENT_BINARY_DIR}/sclang-vars.el + DESTINATION share/emacs/site-lisp/SuperCollider) if (SC_EL_BYTECOMPILE) find_program(EMACS_EXECUTABLE emacs) if(NOT EMACS_EXECUTABLE) @@ -37,7 +39,4 @@ if (SC_EL_BYTECOMPILE) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${el}c DESTINATION share/emacs/site-lisp/SuperCollider) endforeach() -else() - install (FILES ${scel_sources} ${CMAKE_CURRENT_BINARY_DIR}/sclang-vars.el - DESTINATION share/emacs/site-lisp/SuperCollider) endif() From 5abf055a104b82af6f28cd4676adea769253997f Mon Sep 17 00:00:00 2001 From: tejaswidp Date: Fri, 30 Mar 2018 21:53:40 +0530 Subject: [PATCH 2/3] Fixes link to "HelpSource" directory --- el/sclang-vars.el.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/el/sclang-vars.el.in b/el/sclang-vars.el.in index 60fa259..0bc2edb 100644 --- a/el/sclang-vars.el.in +++ b/el/sclang-vars.el.in @@ -16,7 +16,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. ;;; Code: @@ -24,7 +24,7 @@ (defconst sclang-system-data-dir "@PKG_DATA_DIR@" "Installation dependent data directory.") -(defconst sclang-system-help-dir "@PKG_DATA_DIR@/Help" +(defconst sclang-system-help-dir "@PKG_DATA_DIR@/HelpSource" "Installation dependent help directory.") (defconst sclang-system-extension-dir "@PKG_DATA_DIR@/Extensions" From 3ddfd3e677f6efe6a058454feae4ec3df1202757 Mon Sep 17 00:00:00 2001 From: widp Date: Thu, 5 Apr 2018 17:27:56 +0530 Subject: [PATCH 3/3] Revert "Fixes link to "HelpSource" directory" This reverts commit 5abf055a104b82af6f28cd4676adea769253997f. --- el/sclang-vars.el.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/el/sclang-vars.el.in b/el/sclang-vars.el.in index 0bc2edb..60fa259 100644 --- a/el/sclang-vars.el.in +++ b/el/sclang-vars.el.in @@ -16,7 +16,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ;; Boston, MA 02110-1301, USA. ;;; Code: @@ -24,7 +24,7 @@ (defconst sclang-system-data-dir "@PKG_DATA_DIR@" "Installation dependent data directory.") -(defconst sclang-system-help-dir "@PKG_DATA_DIR@/HelpSource" +(defconst sclang-system-help-dir "@PKG_DATA_DIR@/Help" "Installation dependent help directory.") (defconst sclang-system-extension-dir "@PKG_DATA_DIR@/Extensions"