From 3cd2169111bc1b3f2ea0b9ab1fd11773b9e3959a Mon Sep 17 00:00:00 2001
From: Donald Curtis <dcurtis@milkbox.net>
Date: Wed, 22 May 2013 17:46:47 -0500
Subject: [PATCH] Revert "Generate .info and dir files."

This reverts commit 7ce4353889ea199864588f8ae8586d0130fb64d9.

Unintentionally pushod to master branch.
---
 package-build.el | 46 +++++++++-------------------------------------
 1 file changed, 9 insertions(+), 37 deletions(-)

diff --git a/package-build.el b/package-build.el
index 3c668ca9..6e615ac3 100644
--- a/package-build.el
+++ b/package-build.el
@@ -84,7 +84,7 @@ function for access to this function")
 (defvar pb/archive-alist-initialized nil
   "Determines if pb/archive-alist has been initialized.")
 
-(defconst pb/default-files-spec '("*.el" "dir" "*.info" "*.texi" "doc/*.info" "doc/*.texi")
+(defconst pb/default-files-spec '("*.el" "dir" "*.info")
   "Default value for :files attribute in recipes.")
 
 
@@ -675,32 +675,6 @@ file path and DEST is the relative path to which it should be copied."
   "Shorthand way to expand paths in DIR for source files listed in CONFIG."
   (mapcar 'car (pb/expand-config-file-list dir config)))
 
-(defun pb/generate-info-files (files source-dir target-dir)
-  "Create .info files from any .texi files listed in FILES in SOURCE-DIR in TARGET-DIR."
-  (cl-loop for (source-file . dest-file) in files
-           if (string-match ".texi$" source-file)
-           do (pb/run-process
-               nil
-               "makeinfo"
-               (expand-file-name source-file source-dir)
-               "-o"
-               (expand-file-name (concat (file-name-sans-extension dest-file)
-                                         ".info")
-                                 target-dir))))
-
-(defun pb/generate-dir-file (files target-dir)
-  "Create dir file from any .info files listed in FILES in TARGET-DIR."
-  (cl-loop for (source-file . dest-file) in files
-           if (or (string-match ".info$" source-file)
-                  (string-match ".texi$" source-file))
-           do (pb/run-process
-               nil
-               "install-info"
-               (concat "--dir=" (expand-file-name "dir" target-dir))
-               (expand-file-name (concat (file-name-sans-extension dest-file)
-                                         ".info")
-                                 target-dir))))
-
 (defun pb/copy-package-files (files source-dir target-dir)
   "Copy FILES from SOURCE-DIR to TARGET-DIR.
 FILES is a list of (SOURCE . DEST) relative filepath pairs."
@@ -813,6 +787,9 @@ FILES is a list of (SOURCE . DEST) relative filepath pairs."
                  version
                  cfg)))
 
+          (let ((default-directory pkg-cwd))
+            (pb/write-pkg-readme (pb/find-package-commentary pkg-source)
+                                 file-name))
 
           (when (file-exists-p pkg-dir)
             (delete-directory pkg-dir t nil))
@@ -826,16 +803,11 @@ FILES is a list of (SOURCE . DEST) relative filepath pairs."
                                                  package-build-working-dir)))
                              pkg-info)
 
-          (pb/generate-info-files files pkg-cwd pkg-dir)
-          (pb/generate-dir-file files pkg-dir)
-
-          (pb/create-tar (expand-file-name (concat file-name "-" version ".tar")
-                                           package-build-archive-dir)
-                         pkg-dir)
-
-          (let ((default-directory pkg-cwd))
-            (pb/write-pkg-readme (pb/find-package-commentary pkg-source)
-                                 file-name))
+          (pb/create-tar
+           (expand-file-name
+            (concat file-name "-" version ".tar") package-build-archive-dir)
+           pkg-dir
+           (delete-dups (append (mapcar 'cdr files) (list pkg-file))))
 
           (delete-directory pkg-dir t nil)
           (pb/add-to-archive-contents pkg-info 'tar)))