# HG changeset patch
# User samer
# Date 1424443367 0
# Node ID cda9dbcd319dba8262346497e52db092d557a502
# Parent  0acbb359fe6ae1d5e109de3562da4635a531a9b8# Parent  b35af87b0459a894448c9119ad7458b825d54669
Merge

diff -r 0acbb359fe6a -r cda9dbcd319d Makefile
--- a/Makefile	Fri Feb 20 14:39:52 2015 +0000
+++ b/Makefile	Fri Feb 20 14:42:47 2015 +0000
@@ -19,28 +19,34 @@
 # use '-bp' under Linux
 export INSTALL_FLAGS='-bCS'
 
-VER=0.4.1
+VER=0.4.2
 # ---------------- end of configuration ---------------
 export PACKNAME=plosc
+PACKFILE=release/$(PACKNAME)-$(VER).tgz
 
 main: 
 	make -C c
 
 packfile:
 	mkdir -p $(PACKNAME) $(PACKNAME)/c $(PACKNAME)/prolog $(PACKNAME)/example
-	cp -p pack/* $(PACKNAME)
+	sed -e 's/<VER>/$(VER)/' pack/pack.pl > $(PACKNAME)/pack.pl
 	cp -p c/*.c $(PACKNAME)/c
 	cp -p c/Makefile $(PACKNAME)/c
+	cp -p pack/Makefile $(PACKNAME)/Makefile
 	cp -p prolog/*.pl $(PACKNAME)/prolog
 	cp -p README $(PACKNAME)
 	cp -p CHANGES $(PACKNAME)
 	cp -pR example $(PACKNAME)
-	tar czf release/$(PACKNAME)-$(VER).tgz $(PACKNAME)
+	tar czf $(PACKFILE) $(PACKNAME)
 	rm -rf $(PACKNAME)
+	hg add $(PACKFILE)
 
 clean:
 	make -C c clean
 
+packinstall: main packfile
+	swipl -g "pack_install('$(PACKFILE)')"
+
 install: main
 	make -C c install
 	make -C prolog install
diff -r 0acbb359fe6a -r cda9dbcd319d pack/pack.pl
--- a/pack/pack.pl	Fri Feb 20 14:39:52 2015 +0000
+++ b/pack/pack.pl	Fri Feb 20 14:42:47 2015 +0000
@@ -1,7 +1,7 @@
 name(plosc).
-version('0.4.1').
+version('<VER>').
 author('Samer Abdallah','s.abdallah@ucl.ac.uk').
 title('OSC input/output via liblo').
 keywords([midi,osx]).
-download('https://code.soundsoftware.ac.uk/projects/plosc/repository/raw/release/plosc-0.4.1.tgz').
+download('http://code.soundsoftware.ac.uk/projects/plosc/repository/raw/release/plosc-<VER>.tgz').
 
diff -r 0acbb359fe6a -r cda9dbcd319d release/plosc-0.4.1.tgz
Binary file release/plosc-0.4.1.tgz has changed
diff -r 0acbb359fe6a -r cda9dbcd319d release/plosc-0.4.2.tgz
Binary file release/plosc-0.4.2.tgz has changed