From 29dd038ef6fb2bebbd465455c74257d0a39c2cf9 Mon Sep 17 00:00:00 2001
From: Nate Coraor <nate@bx.psu.edu>
Date: Mon, 13 Jun 2016 16:47:55 -0400
Subject: [PATCH] Fixes for installed Galaxy

---
 MANIFEST.in.galaxy => MANIFEST.in |  0
 Makefile                          | 13 ++-----------
 setup.py                          |  1 +
 3 files changed, 3 insertions(+), 11 deletions(-)
 rename MANIFEST.in.galaxy => MANIFEST.in (100%)

diff --git a/MANIFEST.in.galaxy b/MANIFEST.in
similarity index 100%
rename from MANIFEST.in.galaxy
rename to MANIFEST.in
diff --git a/Makefile b/Makefile
index 1450e595e6d..b55d55d1c21 100644
--- a/Makefile
+++ b/Makefile
@@ -80,22 +80,13 @@ clean-grunt-docker-image: ## Remove grunt docker image
 	docker rmi ${GRUNT_DOCKER_NAME}
 
 
-wheels: wheel-galaxy-lib wheel-galaxy-app wheel-galaxy
-
-wheel-galaxy-lib:
-	rm -rf build MANIFEST.in
-	GALAXY_PACKAGE=galaxy-lib python setup.py bdist_wheel
-
-wheel-galaxy-app:
-	rm -rf build MANIFEST.in
-	GALAXY_PACKAGE=galaxy-app python setup.py bdist_wheel
+wheels: wheel-galaxy
 
 # FIXME: it'd be great if client time could be compared against the wheel and
 # not rebuild client if unnecessary. But it's really only a problem in dev.
 # When this stuff goes into production it won't be as big of a deal.
 wheel-galaxy: client
-	ln -s MANIFEST.in.galaxy MANIFEST.in
-	GALAXY_PACKAGE=galaxy python setup.py bdist_wheel
+	python setup.py bdist_wheel
 
 # Release Targets
 release-create-rc: release-ensure-upstream ## Create a release-candidate branch
diff --git a/setup.py b/setup.py
index 5eba845a6b2..8b8ceb480a1 100644
--- a/setup.py
+++ b/setup.py
@@ -30,6 +30,7 @@ setup(
     ''',
     package_data={
         'galaxy': [
+            'config/sample/*',
             'exceptions/error_codes.json',
             'datatypes/converters/*.xml',
             'datatypes/display_applications/configs/*/*.xml',