main d02011de: Simplify GNUmakefile and tex-site.el.in

[Ikumi Keita]

branch: main
commit d02011deede6c8a4aa43e9cb008477cf8d04d6c8
Author: Ikumi Keita <ik...@ikumi.que.jp>
Commit: Ikumi Keita <ik...@ikumi.que.jp>

    Simplify GNUmakefile and tex-site.el.in
    
    * GNUmakefile:
    * tex-site.el.in
    Do constant replacement in advance.
---
 GNUmakefile    | 5 +----
 tex-site.el.in | 8 +++++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index d73c77b1..01608188 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -124,10 +124,7 @@ LASTVERSION:=$(shell grep "^;; Version:" auctex.el \
 AUCTEXVERSION:=$(if $(THISVERSION),$(THISVERSION),$(LASTVERSION).$(AUCTEXDATE))
 
 tex-site.el: tex-site.el.in
-       sed -e 's|@lisppackagelispdir@|(directory-file-name 
(file-name-directory load-file-name))|'\
-           -e 's|@lisppackagedatadir@|(directory-file-name 
(file-name-directory load-file-name))|'\
-           -e 's|@lispautodir@|(if (file-writable-p "/usr/local/var/auctex") 
"/usr/local/var/auctex" "~/.emacs.d/auctex")|'\
-           -e 's|@AUCTEXVERSION@|$(AUCTEXVERSION)|'\
+       sed -e 's|@AUCTEXVERSION@|$(AUCTEXVERSION)|'\
            -e 's|@AUCTEXDATE@|$(AUCTEXDATE)|'\
            $< >$@
 
diff --git a/tex-site.el.in b/tex-site.el.in
index 1d2da038..886d2918 100644
--- a/tex-site.el.in
+++ b/tex-site.el.in
@@ -63,7 +63,7 @@
   :load "tex" :load "latex" :load "tex-style")
 
 (defvar TeX-lisp-directory
-  @lisppackagelispdir@
+  (directory-file-name (file-name-directory load-file-name))
   "The directory where most of the AUCTeX lisp files are located.
 For the location of lisp files associated with
 styles, see the variables TeX-style-* (hand-generated lisp) and
@@ -72,11 +72,13 @@ TeX-auto-* (automatically generated lisp).")
 (add-to-list 'load-path TeX-lisp-directory)
 
 (defvar TeX-data-directory
-  @lisppackagedatadir@
+  (directory-file-name (file-name-directory load-file-name))
   "The directory where the AUCTeX non-Lisp data is located.")
 
 (defcustom TeX-auto-global
-  @lispautodir@
+  (if (file-writable-p "/usr/local/var/auctex/")
+      "/usr/local/var/auctex/"
+    (concat user-emacs-directory "auctex/"))
   "Directory containing automatically generated information.
 
 For storing automatic extracted information about the TeX macros