Merge pull request #20 from iraf-community/terminfo

Fix the installation of the TERMINFO database
iraf-community · Jul 6, 2024 · f41e1c8 · f41e1c8
2 parents 34e097e + 16785d7
commit f41e1c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -102,7 +102,7 @@ xgterm.pkg: ximtool.pkg # This re-uses the same build as ximtool
 	         xgterm/XGTerm.iconset/
 	install $(BUILDDIR)/x11iraf/xgterm/xgterm.man \
 	        $(INSTDIR)/xgterm/XGTerm.app/Contents/Resources/man/xgterm.1
-	TERMINFO=$(INSTDIR)/xgterm/XGTerm.app/Resources/terminfo tic \
+	tic -v -o $(INSTDIR)/xgterm/XGTerm.app/Contents/Resources/terminfo \
 	        $(BUILDDIR)/x11iraf/xgterm/xgterm.terminfo
 	codesign -s - -i community.iraf.xgterm $(INSTDIR)/xgterm/XGTerm.app
 	pkgbuild --identifier community.iraf.xgterm \

diff --git a/xgterm/scripts/postinstall b/xgterm/scripts/postinstall
@@ -11,7 +11,6 @@ APP_PATH=$2
 mkdir -p /usr/local/bin/ /usr/local/share/man/man1/ /usr/local/share/terminfo/78
 
 XGTERM_PATH=${APP_PATH}/XGTerm.app/Contents/Resources
-rm -f /usr/local/bin/xgterm /usr/local/share/man/man1/xgterm.1 /usr/local/share/terminfo/78/xgterm
-ln -s ${XGTERM_PATH}/bin/xgterm /usr/local/bin/
-ln -s ${XGTERM_PATH}/man/xgterm.1 /usr/local/share/man/man1/
-ln -s ${XGTERM_PATH}/terminfo/78/xgterm /usr/local/share/terminfo/78/
+ln -sf ${XGTERM_PATH}/bin/xgterm /usr/local/bin/
+ln -sf ${XGTERM_PATH}/man/xgterm.1 /usr/local/share/man/man1/
+ln -sf ${XGTERM_PATH}/terminfo/78/xgterm /usr/local/share/terminfo/78/