Skip to content

Commit 2019a7d

Browse files
committed
Change data directory to healpix, rather than the package name. Bump version to 3.30.1 in order to tag a release.
1 parent 88a349a commit 2019a7d

4 files changed

Lines changed: 62 additions & 14 deletions

File tree

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dnl
55
dnl +------------------------
66
dnl | Initialize package info
77
dnl +------------------------
8-
AC_INIT([HEALPix], [3.30.0], [work@theodorekisner.com], [healpix-autotools], [https://github.com/tskisner/healpix])
8+
AC_INIT([HEALPix], [3.30.1], [work@theodorekisner.com], [healpix-autotools], [https://github.com/tskisner/healpix])
99
AC_CONFIG_SRCDIR([Makefile.am])
1010
AM_INIT_AUTOMAKE([foreign tar-ustar])
1111
AC_CONFIG_HEADERS(config.h)

data/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
healpixextradir = $(datadir)/@PACKAGE@
2+
healpixextradir = $(datadir)/healpix
33

44
healpixextra_DATA = pixel_window_n0002.fits \
55
pixel_window_n0004.fits \

src/f90/test/Makefile.am

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,52 @@
11

2+
healpixtestdir = $(datadir)/healpix/test
3+
4+
healpixtest_DATA = \
5+
runtest.sh \
6+
almdec.fits \
7+
alm.fits \
8+
alt.par \
9+
ana_cut.par \
10+
ana.par \
11+
cl.fits \
12+
cl_old.fits \
13+
cl_out.fits \
14+
cl_planck1.fits \
15+
cl_planck2.fits \
16+
cl_wmap1.fits \
17+
cl_wmap5.fits \
18+
cl_wmap7.fits \
19+
distmask.fits \
20+
distmask.gif \
21+
hot.par \
22+
map_ext.fits \
23+
map_ext.gif \
24+
map.fits \
25+
map.gif \
26+
map_LOres.fits \
27+
map_LOres.gif \
28+
map_mf.fits \
29+
map_mf.gif \
30+
map_ngfs.fits \
31+
map_ngfs.gif \
32+
map_sm.fits \
33+
map_sm.gif \
34+
mask.fits \
35+
mask.gif \
36+
max.asc \
37+
med.par \
38+
min.asc \
39+
ngfs.par \
40+
planck2013ext_lcdm_cl_v1.fits \
41+
planck2015_lcdm_cl_v2.fits \
42+
prmask.par \
43+
README \
44+
smo.par \
45+
syn.par \
46+
udg.par \
47+
wmap_lcdm_pl_model_yr1_v1.fits \
48+
wmap_lcdm_sz_lens_wmap5_cl_v3.fits \
49+
wmap_lcdm_sz_lens_wmap7_cl_v4.fits
250

351
EXTRA_DIST = \
452
almdec.fits \

src/idl/Makefile.am

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ bin_SCRIPTS = hidl hidlde
1818

1919
CLEANFILES = hidl hidlde
2020

21-
idldir = $(datadir)/@PACKAGE@/idl
21+
idldir = $(datadir)/healpix/idl
2222

2323
idl_DATA = \
2424
HEALPix_startup
@@ -27,22 +27,22 @@ HEALPix_startup
2727
hidlde : hidl
2828

2929
hidl : $(srcdir)/hidl.in $(srcdir)/hidlde.in $(srcdir)/gen_launch.sh
30-
@$(srcdir)/gen_launch.sh "$(prefix)" "$(bindir)" "$(datadir)/@PACKAGE@" "$(srcdir)"
30+
@$(srcdir)/gen_launch.sh "$(prefix)" "$(bindir)" "$(datadir)/healpix" "$(srcdir)"
3131

3232

3333
# install / uninstall all the IDL files
3434

3535
install-data-local:
36-
@$(mkinstalldirs) $(DESTDIR)$(datadir)/@PACKAGE@/idl; \
37-
cp -r $(srcdir)/examples $(DESTDIR)$(datadir)/@PACKAGE@/idl/; \
38-
cp -r $(srcdir)/fits $(DESTDIR)$(datadir)/@PACKAGE@/idl/; \
39-
cp -r $(srcdir)/interfaces $(DESTDIR)$(datadir)/@PACKAGE@/idl/; \
40-
cp -r $(srcdir)/misc $(DESTDIR)$(datadir)/@PACKAGE@/idl/; \
41-
cp -r $(srcdir)/toolkit $(DESTDIR)$(datadir)/@PACKAGE@/idl/; \
42-
cp -r $(srcdir)/visu $(DESTDIR)$(datadir)/@PACKAGE@/idl/; \
43-
cp -r $(srcdir)/zzz_external $(DESTDIR)$(datadir)/@PACKAGE@/idl/; \
44-
chmod -R a=rX,u+w $(DESTDIR)$(datadir)/@PACKAGE@/idl
36+
@$(mkinstalldirs) $(DESTDIR)$(datadir)/healpix/idl; \
37+
cp -r $(srcdir)/examples $(DESTDIR)$(datadir)/healpix/idl/; \
38+
cp -r $(srcdir)/fits $(DESTDIR)$(datadir)/healpix/idl/; \
39+
cp -r $(srcdir)/interfaces $(DESTDIR)$(datadir)/healpix/idl/; \
40+
cp -r $(srcdir)/misc $(DESTDIR)$(datadir)/healpix/idl/; \
41+
cp -r $(srcdir)/toolkit $(DESTDIR)$(datadir)/healpix/idl/; \
42+
cp -r $(srcdir)/visu $(DESTDIR)$(datadir)/healpix/idl/; \
43+
cp -r $(srcdir)/zzz_external $(DESTDIR)$(datadir)/healpix/idl/; \
44+
chmod -R a=rX,u+w $(DESTDIR)$(datadir)/healpix/idl
4545

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

0 commit comments

Comments
 (0)