diff options
| author | Joe Hunkeler <jhunkeler@gmail.com> | 2015-08-19 16:37:20 -0400 |
|---|---|---|
| committer | Joe Hunkeler <jhunkeler@gmail.com> | 2015-08-19 16:37:20 -0400 |
| commit | 24a35de9b3cd1fc8d2556f4e02a7692d399381af (patch) | |
| tree | 60ea9378b95adebe4978cdde054d4c2d6a8c1657 | |
| parent | 036ed11359ae693280566ac27e15abaacf383c14 (diff) | |
| download | cbc-recipes-24a35de9b3cd1fc8d2556f4e02a7692d399381af.tar.gz | |
More changes that change nothing
| -rw-r--r-- | iraf-src/iraf.ini | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/iraf-src/iraf.ini b/iraf-src/iraf.ini index 45f7540..7a14ccb 100644 --- a/iraf-src/iraf.ini +++ b/iraf-src/iraf.ini @@ -18,7 +18,7 @@ git_url: ssh://git@bitbucket.org/jhunkeler/${package:name}-src [build] number: 1 -detect_binary_files_with_prefix: True +#detect_binary_files_with_prefix: True [requirements] build: @@ -55,10 +55,7 @@ linux: mkdir -p bin.generic mkdir -p bin.$$IRAFARCH - mkdir -p noao/bin.$IRAFARCH - mkdir -p vo/bin.$IRAFARCH - mkdir -p unix/as.generic - set -x + find . -lname '/iraf/iraf/*' \ -exec sh -c 'ln -snf \ "$$(readlink "$$0" \ @@ -68,14 +65,18 @@ linux: \( -name "*.c" \ -o -name "*.f" \ -o -name "*.h" \ - #-o -name "*.x" \ - -o -name "*.sh" \ - -o -name "*.csh" \ + -o -name "*.x" \ + -o -name "*.sh*" \ + -o -name "*.csh*" \ -o -name "*akefile*" \ + -o -name "*mkpkg*" \ + -o -name "*mklibs*" \ + -o -name "*mkbase*" \ + -o -name "*zzsetenv.def*" \ -o -name "*install*" \) \ -exec sed -i -e "s|/iraf/iraf|$$PREFIX/iraf|g" '{}' \; - export CFLAGS="-arch i386 -m32 -I$$FAKEHOME/ -I$$iraf/bin" + export CFLAGS="-arch i386 -m32 -I$$FAKEHOME/ -I $$iraf/include -I$$iraf/bin" export LDFLAGS="-arch i386" mkdir -p override @@ -87,15 +88,17 @@ linux: mkdir -p include #ln -s ../unix/hlib/libc/iraf.h $$FAKEHOME/ - ln -s ../unix/bin/f2c.h $$FAKEHOME/ - cp $$iraf/unix/hlib/libc/vosproto.h $$FAKEHOME/ - cp $$iraf/unix/boot/xyacc/yaccpar.x $$FAKEHOME/ + ln -s ../unix/hlib/libc/iraf.h $$iraf/include/ + ln -s ../unix/bin/f2c.h $$iraf/include/ + cp $$iraf/unix/hlib/libc/vosproto.h $$iraf/include/ + cp $$iraf/unix/boot/xyacc/yaccpar.x $$iraf/include/ + mkdir -p $$iraf/include/curl && touch $$iraf/include/curl/types.h touch $$iraf/extern/.zzsetenv.def - echo '$$set XFLAGS = "$$(XFLAGS) -/I$$(iraf)fakehome -/I$$(iraf)include"' >> unix/hlib/mkpkg.inc - echo '$$set XVFLAGS = "$$(XVFLAGS) -/I$$(iraf)fakehome -/I$$(iraf)include"' >> unix/hlib/mkpkg.inc - echo '$$set LFLAGS = "$$(LFLAGS) -/I$$(iraf)fakehome -/I$$(iraf)include" -/L$$(iraf)bin -/$$(iraf)bin.$$(IRAFARCH)' >> unix/hlib/mkpkg.inc + echo '$$set XFLAGS = "$$(XFLAGS) -/I$$(iraf)fakehome -/I$$(iraf)include"' >> unix/hlib/mkpkg.inc + echo '$$set XVFLAGS = "$$(XVFLAGS) -/I$$(iraf)fakehome -/I$$(iraf)include"' >> unix/hlib/mkpkg.inc + echo '$$set LFLAGS = "$$(LFLAGS) -/I$$(iraf)fakehome -/I$$(iraf)include" -/L$$(iraf)bin -/$$(iraf)bin.$$(IRAFARCH)' >> unix/hlib/mkpkg.inc ( cd unix/f2c/src && \ make -f makefile.u CFLAGS="$$CFLAGS" LDFLAGS="$$LDFLAGS" && \ @@ -105,9 +108,8 @@ linux: make -f makefile.u CFLAGS="$$CFLAGS" LDFLAGS="$$LDFLAGS" && \ cp f2c.h libf2c.a $$iraf/unix/bin.$$IRAFARCH/ ) - ( make $$IRAFARCH ) - - ( util/mksysgen ) + ( make $$IRAFARCH && \ + util/mksysgen ) windows: echo Not supported on Windows |