3 files changed, 19 insertions, 31 deletions
diff --git a/distribution/posix/CMakeLists.txt b/distribution/posix/CMakeLists.txt
index 6e44581..d80322a 100644
--- a/distribution/posix/CMakeLists.txt
+++ b/distribution/posix/CMakeLists.txt
@@ -8,11 +8,12 @@ set(CPACK_RPM_PACKAGE_GROUP "Applications/Engineering")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}////xtrkcad-desc.txt")
 set(CPACK_PACKAGE_FILE_NAME "xtrkcad-setup-${XTRKCAD_VERSION}-${CPACK_PACKAGE_RELEASE}.${CMAKE_SYSTEM_PROCESSOR}")
 
-if(XTRKCAD_PACKAGE_GA_RELEASE)
-	set(CPACK_INSTALL_PREFIX "/usr" )
-else()
+if(XTRKCAD_BETA MATCHES "-beta")
 	set(CPACK_INSTALL_PREFIX "/usr/local" )
+else()
+	set(CPACK_INSTALL_PREFIX "/usr" )
 endif()
+set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/postinst;${CMAKE_CURRENT_SOURCE_DIR}/prerm")
 
 set(CPACK_PACKAGING_INSTALL_PREFIX ${CPACK_INSTALL_PREFIX})
 
@@ -36,12 +37,6 @@ if(NOT XTRKCAD_USE_BROWSER)
 #    message(AUTHOR_WARNING "Add dependency to webkitgtk for viewing help!")
 endif()
 
-#Add dependency to MiniXML (mxml) if configured
-if(XTRKCAD_CREATE_SVG)
-	set(CPACK_RPM_PACKAGE_REQUIRES
-		"${CPACK_RPM_PACKAGE_REQUIRES} mxml")
-endif()		
-
 # exclude these directories from the rpm
 set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
 	"/usr/local"
@@ -55,11 +50,17 @@ set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
 	"/usr/share/pixmaps"
 )
 
+set(CPACK_RPM_DEFAULT_DIR_PERMISSIONS
+    OWNER_READ OWNER_WRITE OWNER_EXECUTE
+    GROUP_READ GROUP_EXECUTE
+    WORLD_READ WORLD_EXECUTE)
+
+
 set(CPACK_RPM_CHANGELOG_FILE "${CMAKE_CURRENT_SOURCE_DIR}////changelog.txt")
 
 set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 
-set(CPACK_DEBIAN_PACKAGE_NAME "XTrkCad")
+set(CPACK_DEBIAN_PACKAGE_NAME "XTrkCad${XTRKCAD_BETA}")
 
 set(CPACK_DEBIAN_PACKAGE_VERSION "1:${XTRKCAD_VERSION}")
 
@@ -95,7 +96,4 @@ set(CPACK_PACKAGE_EXECUTABLES "xtrkcad;XTrkCad-5.2.1-Beta")
 
 set(CPACK_CREATE_DESKTOP_LINKS "xtrkcad")
 
-set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/postinst;${CMAKE_CURRENT_SOURCE_DIR}/prerm")
-
 include(CPack)
-
diff --git a/distribution/posix/postinst b/distribution/posix/postinst
index 914534d..d4e22cb 100755
--- a/distribution/posix/postinst
+++ b/distribution/posix/postinst
@@ -1,5 +1,5 @@
 #!/bin/sh
-LOGF=/tmp/xtrkcad-setup.log
+LOGF=${HOME}/xtrkcad-setup.log
 if [ -f "${LOGF}" ] ; then
 	chmod 666 ${LOGF}
 	echo postinst: $* >> ${LOGF}
@@ -7,14 +7,9 @@ else
 	LOGF=/dev/null
 fi
 
-if [ -d /usr/local/share/xtrkcad ] ; then
-	INSTALLDIR=/usr/local/share/xtrkcad
-elif [ -d /usr/share/xtrkcad ] ; then
-	INSTALLDIR=/usr/share/xtrkcad
-else
-	echo No existing XTrkCad install >> ${LOGF}
-	exit 1
-fi
+# Note: when branching for Beta, change the next line to /usr/local/share/xtrkcad-beta
+#       when building for GA, change the next line back to /usr/share/xtrkcad
+INSTALLDIR=/usr/local/share/xtrkcad-beta
 
 ( su -c "sh ${INSTALLDIR}/xtrkcad-setup install ${INSTALLDIR}" -l $SUDO_USER ) >> ${LOGF} 2>&1
 
diff --git a/distribution/posix/prerm b/distribution/posix/prerm
index 3c5db28..71cfd00 100755
--- a/distribution/posix/prerm
+++ b/distribution/posix/prerm
@@ -1,5 +1,5 @@
 #!/bin/sh
-LOGF=/tmp/xtrkcad-setup.log
+LOGF=${HOME}/xtrkcad-setup.log
 if [ -f "${LOGF}" ] ; then
 	chmod 666 ${LOGF}
 	echo prerm: $* >> ${LOGF}
@@ -7,14 +7,9 @@ else
 	LOGF=/dev/null
 fi
 
-if [ -d /usr/local/share/xtrkcad ] ; then
-	INSTALLDIR=/usr/local/share/xtrkcad
-elif [ -d /usr/share/xtrkcad ] ; then
-	INSTALLDIR=/usr/share/xtrkcad
-else
-	echo No existing XTrkCad install >> ${LOGF}
-	exit 1
-fi
+# Note: when branching for Beta, change the next line to /usr/local/share/xtrkcad-beta
+#       when building for GA, change the next line back to /usr/share/xtrkcad
+INSTALLDIR=/usr/local/share/xtrkcad-beta
 
 ( su -c "sh ${INSTALLDIR}/xtrkcad-setup remove ${INSTALLDIR}" -l $SUDO_USER ) >> ${LOGF} 2>&1