From b1d26db8d9f478d1a52327287c8f02739ba200a1 Mon Sep 17 00:00:00 2001 From: Muhammad Aqeel Date: Tue, 15 Mar 2016 11:46:04 +0000 Subject: [PATCH] Fix PIP packaging code so it works nicely on Linux and Mac. --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 6b0e3bcbf..adae41c44 100644 --- a/Makefile +++ b/Makefile @@ -34,13 +34,13 @@ PIP_CHECK_CMD = which pip &> /dev/null && pip show pip | grep Metadata-Version 2 PGADMIN_SRC_DIR = pgadmin4 PGADMIN_EGG = ${PGADMIN_SRC_DIR}.egg-info PGADMIN_BUILD = build -PGADMIN_DIST = build +PGADMIN_DIST = dist PGADMIN_MANIFEST = MANIFEST.in PGADMIN_INSTALL_CMD = pip install --use-wheel --find-links=${PGADMIN_DIST} ${PGADMIN_SRC_DIR} define create_manifest -@echo 'recursive-include ${PGADMIN_SRC_DIR} *\nglobal-exclude pgadmin4.db *.pyc' > ${PGADMIN_MANIFEST} +@printf 'recursive-include ${PGADMIN_SRC_DIR} *\nglobal-exclude pgadmin4.db *.pyc' > ${PGADMIN_MANIFEST} endef define build @@ -75,7 +75,7 @@ ifeq ($(shell ${WHEEL_CHECK_CMD}),) false; \ fi endif - + rm -rf ${PGADMIN_SRC_DIR} cp -r web ${PGADMIN_SRC_DIR} $(call create_manifest) $(call build)