Skip to content

Commit

Permalink
Change data directory to healpix, rather than the package name. Bump …
Browse files Browse the repository at this point in the history
…version to 3.30.1 in order to tag a release.
  • Loading branch information
tskisner committed Feb 11, 2016
1 parent 88a349a commit 2019a7d
Show file tree
Hide file tree
Showing 4 changed files with 62 additions and 14 deletions.
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dnl
dnl +------------------------
dnl | Initialize package info
dnl +------------------------
AC_INIT([HEALPix], [3.30.0], [[email protected]], [healpix-autotools], [https://github.com/tskisner/healpix])
AC_INIT([HEALPix], [3.30.1], [[email protected]], [healpix-autotools], [https://github.com/tskisner/healpix])
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([foreign tar-ustar])
AC_CONFIG_HEADERS(config.h)
Expand Down
2 changes: 1 addition & 1 deletion data/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

healpixextradir = $(datadir)/@PACKAGE@
healpixextradir = $(datadir)/healpix

healpixextra_DATA = pixel_window_n0002.fits \
pixel_window_n0004.fits \
Expand Down
48 changes: 48 additions & 0 deletions src/f90/test/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,4 +1,52 @@

healpixtestdir = $(datadir)/healpix/test

healpixtest_DATA = \
runtest.sh \
almdec.fits \
alm.fits \
alt.par \
ana_cut.par \
ana.par \
cl.fits \
cl_old.fits \
cl_out.fits \
cl_planck1.fits \
cl_planck2.fits \
cl_wmap1.fits \
cl_wmap5.fits \
cl_wmap7.fits \
distmask.fits \
distmask.gif \
hot.par \
map_ext.fits \
map_ext.gif \
map.fits \
map.gif \
map_LOres.fits \
map_LOres.gif \
map_mf.fits \
map_mf.gif \
map_ngfs.fits \
map_ngfs.gif \
map_sm.fits \
map_sm.gif \
mask.fits \
mask.gif \
max.asc \
med.par \
min.asc \
ngfs.par \
planck2013ext_lcdm_cl_v1.fits \
planck2015_lcdm_cl_v2.fits \
prmask.par \
README \
smo.par \
syn.par \
udg.par \
wmap_lcdm_pl_model_yr1_v1.fits \
wmap_lcdm_sz_lens_wmap5_cl_v3.fits \
wmap_lcdm_sz_lens_wmap7_cl_v4.fits

EXTRA_DIST = \
almdec.fits \
Expand Down
24 changes: 12 additions & 12 deletions src/idl/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ bin_SCRIPTS = hidl hidlde

CLEANFILES = hidl hidlde

idldir = $(datadir)/@PACKAGE@/idl
idldir = $(datadir)/healpix/idl

idl_DATA = \
HEALPix_startup
Expand All @@ -27,22 +27,22 @@ HEALPix_startup
hidlde : hidl

hidl : $(srcdir)/hidl.in $(srcdir)/hidlde.in $(srcdir)/gen_launch.sh
@$(srcdir)/gen_launch.sh "$(prefix)" "$(bindir)" "$(datadir)/@PACKAGE@" "$(srcdir)"
@$(srcdir)/gen_launch.sh "$(prefix)" "$(bindir)" "$(datadir)/healpix" "$(srcdir)"


# install / uninstall all the IDL files

install-data-local:
@$(mkinstalldirs) $(DESTDIR)$(datadir)/@PACKAGE@/idl; \
cp -r $(srcdir)/examples $(DESTDIR)$(datadir)/@PACKAGE@/idl/; \
cp -r $(srcdir)/fits $(DESTDIR)$(datadir)/@PACKAGE@/idl/; \
cp -r $(srcdir)/interfaces $(DESTDIR)$(datadir)/@PACKAGE@/idl/; \
cp -r $(srcdir)/misc $(DESTDIR)$(datadir)/@PACKAGE@/idl/; \
cp -r $(srcdir)/toolkit $(DESTDIR)$(datadir)/@PACKAGE@/idl/; \
cp -r $(srcdir)/visu $(DESTDIR)$(datadir)/@PACKAGE@/idl/; \
cp -r $(srcdir)/zzz_external $(DESTDIR)$(datadir)/@PACKAGE@/idl/; \
chmod -R a=rX,u+w $(DESTDIR)$(datadir)/@PACKAGE@/idl
@$(mkinstalldirs) $(DESTDIR)$(datadir)/healpix/idl; \
cp -r $(srcdir)/examples $(DESTDIR)$(datadir)/healpix/idl/; \
cp -r $(srcdir)/fits $(DESTDIR)$(datadir)/healpix/idl/; \
cp -r $(srcdir)/interfaces $(DESTDIR)$(datadir)/healpix/idl/; \
cp -r $(srcdir)/misc $(DESTDIR)$(datadir)/healpix/idl/; \
cp -r $(srcdir)/toolkit $(DESTDIR)$(datadir)/healpix/idl/; \
cp -r $(srcdir)/visu $(DESTDIR)$(datadir)/healpix/idl/; \
cp -r $(srcdir)/zzz_external $(DESTDIR)$(datadir)/healpix/idl/; \
chmod -R a=rX,u+w $(DESTDIR)$(datadir)/healpix/idl

uninstall-local:
@rm -rf $(DESTDIR)$(datadir)/@PACKAGE@/idl
@rm -rf $(DESTDIR)$(datadir)/healpix/idl

0 comments on commit 2019a7d

Please sign in to comment.