From: <no...@so...> - 2001-09-13 15:42:55
|
Patches item #461247, was opened at 2001-09-13 08:42 You can respond by visiting: http://sourceforge.net/tracker/?func=detail&atid=304421&aid=461247&group_id=4421 Category: MAIN branch Group: None Status: Open Resolution: None Priority: 5 Submitted By: Axel Beckert (xtaran) Assigned to: Nobody/Anonymous (nobody) Summary: Patch for 2.0.0 Makefile on Solaris Initial Comment: The original Makefile fails on Solaris, because on Solaris the sh is a jsh and not a bash. So the used negations in if-statements are not parsed correctly. The following patch should fix this (letting test do the negations, not sh) and still be working under bash respective Linux: *** Makefile.original Thu Sep 13 16:33:16 2001 --- Makefile Thu Sep 13 17:26:55 2001 *************** *** 57,63 **** # version of perl. # I should also grab an install-sh instead of using $(CP) slash: ! if ! [ $(RPM) ] ; then \ (cd Slash; $(PERL) Makefile.PL; make); \ else \ (cd Slash; $(PERL) Makefile.PL INSTALLSITEARCH=$(INSTALLSITEARCH) INSTALLSITELIB=$(INSTALLSITELIB) INSTALLMAN3DIR=$(INSTALLMAN3DIR); make); \ --- 57,63 ---- # version of perl. # I should also grab an install-sh instead of using $(CP) slash: ! if [ ! "$(RPM)" ] ; then \ (cd Slash; $(PERL) Makefile.PL; make); \ else \ (cd Slash; $(PERL) Makefile.PL INSTALLSITEARCH=$(INSTALLSITEARCH) INSTALLSITELIB=$(INSTALLSITELIB) INSTALLMAN3DIR=$(INSTALLMAN3DIR); make); \ *************** *** 68,74 **** for a in $(PLUGINS); do \ (cd $$a; \ if [ -f Makefile.PL ]; then \ ! if ! [ $(RPM) ] ; then \ $(PERL) Makefile.PL; make;\ else \ $(PERL) Makefile.PL INSTALLSITEARCH=$(INSTALLSITEARCH) INSTALLSITELIB=$(INSTALLSITELIB) INSTALLMAN3DIR=$(INSTALLMAN3DIR); make; \ --- 68,74 ---- for a in $(PLUGINS); do \ (cd $$a; \ if [ -f Makefile.PL ]; then \ ! if [ ! "$(RPM)" ] ; then \ $(PERL) Makefile.PL; make;\ else \ $(PERL) Makefile.PL INSTALLSITEARCH=$(INSTALLSITEARCH) INSTALLSITELIB=$(INSTALLSITELIB) INSTALLMAN3DIR=$(INSTALLMAN3DIR); make; \ *************** *** 99,105 **** if [ -f Makefile ]; then \ make install; \ elif [ -f Makefile.PL ]; then \ ! if ! [ $(RPM) ] ; then \ $(PERL) Makefile.PL; \ else \ $(PERL) Makefile.PL INSTALLSITEARCH=$(INSTALLSITEARCH) INSTALLSITELIB=$(INSTALLSITELIB) INSTALLMAN3DIR=$(INSTALLMAN3DIR); \ --- 99,105 ---- if [ -f Makefile ]; then \ make install; \ elif [ -f Makefile.PL ]; then \ ! if [ ! "$(RPM)" ] ; then \ $(PERL) Makefile.PL; \ else \ $(PERL) Makefile.PL INSTALLSITEARCH=$(INSTALLSITEARCH) INSTALLSITELIB=$(INSTALLSITELIB) INSTALLMAN3DIR=$(INSTALLMAN3DIR); \ And here's a more overviewable, non-context-based version of this patch: 60c60 < if ! [ $(RPM) ] ; then \ --- > if [ ! "$(RPM)" ] ; then \ 71c71 < if ! [ $(RPM) ] ; then \ --- > if [ ! "$(RPM)" ] ; then \ 102c102 < if ! [ $(RPM) ] ; then \ --- > if [ ! "$(RPM)" ] ; then \ ---------------------------------------------------------------------- You can respond by visiting: http://sourceforge.net/tracker/?func=detail&atid=304421&aid=461247&group_id=4421 |