better Makefile

web2py · Feb 14, 2015 · e00fcc7 · e00fcc7
1 parent a3cbfb6
commit e00fcc7
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -65,10 +65,10 @@ app:
 	#python web2py.py -S welcome -R __exit__.py
 	#cd ../web2py_osx/site-packages/; unzip ../site-packages.zip
 	#find gluon -path '*.pyc' -exec cp {} ../web2py_osx/site-packages/{} \;
-	#cd ../web2py_osx/site-packages/; zip -r ../site-packages.zip *
-	#mv ../web2py_osx/site-packages.zip ../web2py_osx/web2py/web2py.app/Contents/Resources/lib/python2.7
-	find gluon -path '*.py' -exec cp -r --parents {} ../web2py_osx/web2py/web2py.app/Contents/Resources/ \;	
-	find gluon -path '*.pyc' -exec cp -r --parents {} ../web2py_osx/web2py/web2py.app/Contents/Resources/ \;	
+
+	find gluon -path '*.pyc' -exec cp -r --parents {} ../web2py_osx/site-packages/ \;
+	cd ../web2py_osx/site-packages/; zip -r ../site-packages.zip *
+	mv ../web2py_osx/site-packages.zip ../web2py_osx/web2py/web2py.app/Contents/Resources/lib/python2.7
 	cp README.markdown ../web2py_osx/web2py/web2py.app/Contents/Resources
 	cp NEWINSTALL ../web2py_osx/web2py/web2py.app/Contents/Resources
 	cp LICENSE ../web2py_osx/web2py/web2py.app/Contents/Resources
@@ -85,8 +85,7 @@ app:
 
 	mv ../web2py_osx/web2py_osx.zip .
 win:
-	find gluon -path '*.py' -exec cp -r --parents {} ../web2py_osx/web2py/web2py.app/Contents/Resources/ \;
-	find gluon -path '*.pyc' -exec cp -r --parents {} ../web2py_osx/web2py/web2py.app/Contents/Resources/ \;
+	find gluon -path '*.pyc' -exec cp -r --parents {} ../web2py_win/library/ \;
 	cd ../web2py_win/library/; zip -r ../library.zip *
 	mv ../web2py_win/library.zip ../web2py_win/web2py
 	cp README.markdown ../web2py_win/web2py/