From 5d0232ba6753d55c1a2154d94b8d50e032b8dc52 Mon Sep 17 00:00:00 2001
From: Phillip Lord <phillip.lord@russet.org.uk>
Date: Thu, 15 Sep 2016 09:46:30 +0100
Subject: [PATCH] Multifile packages now work

---
 packages/README.org                | 3 ---
 packages/admin/package-makefile.el | 2 ++
 packages/core/example/example.el   | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/README.org b/packages/README.org
index 6f43990b605..9c5fa7b3c28 100644
--- a/packages/README.org
+++ b/packages/README.org
@@ -55,9 +55,6 @@ Files in the "admin" directory should probably be in the emacs-root admin.
 
 * Bugs
 
-packages cannot include each other.
-
-
 package.el does not initialize when emacs is launched with -q. This is
 somewhat problematic, since packages in the "core" dir should probably
 always be loaded. Unfortunately package.el is either initialized or
diff --git a/packages/admin/package-makefile.el b/packages/admin/package-makefile.el
index 3ea4edae964..5c600c459f4 100644
--- a/packages/admin/package-makefile.el
+++ b/packages/admin/package-makefile.el
@@ -16,6 +16,7 @@
 
 %s: %s
 \t$(EMACS) --batch --directory=admin \\
+\t\t--directory=%s/%s \\
 \t\t--load admin/package-build.el \\
 \t\t--eval '(package-build-prepare \"%s/%s\")'
 "
@@ -37,6 +38,7 @@
         nil
         ".*el$"))
       " ")
+     top-dir base-dir
      top-dir base-dir)))
 
 (defun package-makefile--pkg-targets (top-dir all-dirs)
diff --git a/packages/core/example/example.el b/packages/core/example/example.el
index 9044b09af8f..5be11f09c00 100644
--- a/packages/core/example/example.el
+++ b/packages/core/example/example.el
@@ -12,3 +12,5 @@
 (defun example ()
   (interactive)
   (message "Hello from Example"))
+
+(provide 'example)
-- 
2.39.5