urbit-x86_64.diff

diff --git a/Makefile b/Makefile
index bffa4f1..f245be0 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ ifneq (,$(wildcard /usr/local/opt/openssl/.))
   OPENSSLLIB=-L/usr/local/opt/openssl/lib
 endif
 
-RM=rm -f
+RM=rm -rf
 ifneq ($(UNAME),FreeBSD)
 CC=gcc
 CXX=g++
@@ -484,8 +484,10 @@ osxpackage:
 	$(MAKE) $(BIN)/urbit LIB=/usr/local/lib/urb STATIC=yes
 	mkdir -p inst/usr/local/lib/urb inst/usr/local/bin
 	cp $(BIN)/urbit inst/usr/local/bin
-	cp urb/urbit.pill inst/usr/local/lib/urb
-	cp -R urb/zod inst/usr/local/lib/urb
+	cp urbit.pill inst/usr/local/lib/urb
+	#cp -R urb/zod inst/usr/local/lib/urb
+	mkdir -p inst/usr/local/lib/urb
+	cp -R arvo inst/usr/local/lib/urb/arvo
 	pkgbuild --root inst --identifier org.urbit.urbit --version 0.2 urbit.pkg
 
 debbuild:
@@ -494,8 +496,10 @@ debbuild:
 debinstall:
 	mkdir -p $(DESTDIR)/usr/bin $(DESTDIR)/usr/share/urb
 	install -m755 $(BIN)/urbit $(DESTDIR)/usr/bin
-	cp urb/urbit.pill $(DESTDIR)/usr/share/urb
-	cp -R urb/zod $(DESTDIR)/usr/share/urb
+	cp urbit.pill $(DESTDIR)/usr/share/urb
+	#cp -R urb/zod $(DESTDIR)/usr/share/urb
+	mkdir -p $(DESTDIR)/usr/share/urb
+	cp -R arvo $(DESTDIR)/usr/share/urb/arvo
 
 clean:
 	$(RM) $(VERE_OFILES) $(BIN)/urbit urbit.pkg $(VERE_DFILES) $(TAGS)